Bug 485220: [Architecture] Provide a more modular architecture

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

Factor UI dependencies out of the UML Element Types bundle.  This includes
moving some advices that interact with the user into a new
org.eclipse.papyrus.uml.service.types.ui bundle.

Pull up the PasteCommandService and IPasteCommandProvider API into the
Infra Diagram layer where the extension point is defined.  Deprecate the
old API in the UML layer.

Introduce a service for participation of languages in CSS styling:

* styling reset actions in the Reset Style command
* access to semantic model classes and properties to make available to CSS

Factor PapyrusObservableValue and cohorts out of the UML Tools bundle
into the Infra Layer for more general reuse and to relieve the
Diagram Infrastructure layer of UML dependencies.  The old API remains as
deprecated.

Remove the Infra Diagram Layer dependency on UML Layer for property
testers governing deletion in the diagram.  Includes introduction of
a new IGraphicalDeletionHelper OSGi service for delegation of the
determination of whether an element can be deleted from the diagram and
replacement of the XML expression properties

* org.eclipse.papyrus.uml.diagram.common.isSemanticDeletion
* org.eclipse.papyrus.uml.diagram.common.isReadOnly

by

* org.eclipse.papyrus.infra.gmfdiag.common.isSemanticDeletion
* org.eclipse.papyrus.infra.gmfdiag.common.canDelete

(where the latter is the negation of the property that it supersedes)

Extract UML dependencies from the Diagram Outline and CSS Editor bundles.

Remove unused MDTUtil APIs that referenced a UML-specific annotation.

Move the Diagram Infrastructure CSS Palette bundle into the UML layer because it
serves to provide extensions on the Palette Service, which is an overtly
UML-specific capability.

All client APIs for the Properties View are moved from
org.eclipse.papyrus.views.properties bundle to a new
org.eclipse.papyrus.infra.properties.ui bundle.  This
includes renaming of:

* extension points
* label-provider contexts
* XWT namespaces

Add an "all UI tests" suite.

Define a componentized hierarchical build layout of the main plug-ins

Change-Id: I43f8f3644857a18b69715f5a2f1da9b1cf286d67

319 files changed, 9123 insertions, 9123 deletions

diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF
index 4590415c6b4..f7070603c90 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.ui,

- org.eclipse.core.runtime,

- org.eclipse.papyrus.views.properties;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.properties;bundle-version="1.2.0"

-Bundle-Vendor: Eclipse Modeling Project

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: Marte properties (Incubation)

-Bundle-Activator: org.eclipse.papyrus.marte.properties.Activator

-Bundle-ManifestVersion: 2

-Bundle-SymbolicName: org.eclipse.papyrus.marte.properties;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.papyrus.infra.properties.ui;bundle-version="1.2.0",
+ org.eclipse.papyrus.uml.properties;bundle-version="1.2.0"
+Bundle-Vendor: Eclipse Modeling Project
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.2.0.qualifier
+Bundle-Name: Marte properties (Incubation)
+Bundle-Activator: org.eclipse.papyrus.marte.properties.Activator
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.papyrus.marte.properties;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAcquire.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAcquire.xwt
index b93231c0953..9729eb6588d 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAcquire.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAcquire.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="Acquire">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Acquire:isBlocking"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="Acquire">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Acquire:isBlocking"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAlarm.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAlarm.xwt
index cbc0483fd3e..4c1fe7edd70 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAlarm.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAlarm.xwt
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	text="Alarm">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:Alarm:isWatchdog"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:isMaskable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	text="Alarm">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:Alarm:isWatchdog"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:isMaskable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocate.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocate.xwt
index a881827529e..bbe3d8e1c60 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocate.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocate.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="Allocate">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="Allocate">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocateActivityGroup.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocateActivityGroup.xwt
index 3518b2ea570..ea755812999 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocateActivityGroup.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocateActivityGroup.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="AllocateActivityGroup">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:AllocateActivityGroup:isUnique"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="AllocateActivityGroup">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:AllocateActivityGroup:isUnique"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocated.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocated.xwt
index 2a85e1252cf..640581619a9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocated.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAllocated.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="Allocated">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocated:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="Allocated">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocated:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAssign.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAssign.xwt
index 24dd76aa35b..6f0c8a48ce1 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAssign.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleAssign.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="Assign">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Assign:kind"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Assign:nature"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="Assign">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Assign:kind"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Assign:nature"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleBoundedSubtype.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleBoundedSubtype.xwt
index 6a4e205eaea..49ac784630f 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleBoundedSubtype.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleBoundedSubtype.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="BoundedSubtype">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:isMaxOpen"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:isMinOpen"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="BoundedSubtype">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:isMaxOpen"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:isMinOpen"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleChoiceType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleChoiceType.xwt
index 45c6dabb53b..055be9abcc0 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleChoiceType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleChoiceType.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="ChoiceType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="ChoiceType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerFeature.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerFeature.xwt
index ba3c462716a..eb0d4296b9e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerFeature.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerFeature.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="ClientServerFeature">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:ClientServerFeature:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="ClientServerFeature">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:ClientServerFeature:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerPort.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerPort.xwt
index 09e8263e19f..fabe9c7c5c6 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerPort.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerPort.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="ClientServerPort">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:ClientServerPort:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="ClientServerPort">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:ClientServerPort:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerSpecification.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerSpecification.xwt
index c46d6c69dff..4ea04c5f5ff 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerSpecification.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClientServerSpecification.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="ClientServerSpecification">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="ClientServerSpecification">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClock.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClock.xwt
index 46d4c70203c..30b7925a279 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClock.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClock.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Clock">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:Clock:standard"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Clock">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:Clock:standard"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockConstraint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockConstraint.xwt
index 7285823dbe5..284d87f1cba 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockConstraint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockConstraint.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="ClockConstraint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isCoincidenceBased"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isPrecedenceBased"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isChronometricBased"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="ClockConstraint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isCoincidenceBased"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isPrecedenceBased"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isChronometricBased"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockResource.xwt
index a891b7215b4..48142b58dd5 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="ClockResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="ClockResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockType.xwt
index 582fa68c2e2..04f56caba01 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleClockType.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="ClockType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:isLogical"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:nature"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="ClockType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:isLogical"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:nature"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCollectionType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCollectionType.xwt
index 4e23110bc87..b62fdb5fe10 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCollectionType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCollectionType.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="CollectionType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="CollectionType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationEndPoint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationEndPoint.xwt
index 57e1a2cd3bd..2fc24e6dfaf 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationEndPoint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationEndPoint.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="CommunicationEndPoint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="CommunicationEndPoint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationMedia.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationMedia.xwt
index 4c98340d5ff..f8a6fb1a110 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationMedia.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleCommunicationMedia.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="CommunicationMedia">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="CommunicationMedia">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleComputingResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleComputingResource.xwt
index 645c60b8a5d..a55a3abec8e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleComputingResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleComputingResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="ComputingResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="ComputingResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleConcurrencyResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleConcurrencyResource.xwt
index 6617181e8a7..90a7146a53b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleConcurrencyResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleConcurrencyResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="ConcurrencyResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="ConcurrencyResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleConfiguration.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleConfiguration.xwt
index 9b8e4269226..c0d508a8fe4 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleConfiguration.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleConfiguration.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="Configuration">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="Configuration">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataEvent.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataEvent.xwt
index 08ec4e67b14..8249699d015 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataEvent.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataEvent.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="DataEvent">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="DataEvent">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataPool.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataPool.xwt
index d962a55ef61..a8ad15a245b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataPool.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDataPool.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="DataPool">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:DataPool:ordering"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="DataPool">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:DataPool:ordering"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDefaultLink.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDefaultLink.xwt
index ca8a106c8b0..a23aeede2b9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDefaultLink.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDefaultLink.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="DefaultLink">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="DefaultLink">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceBroker.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceBroker.xwt
index f277fbee9a9..00aaf3f8d15 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceBroker.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceBroker.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="DeviceBroker">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:isBuffered"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:accessPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="DeviceBroker">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:isBuffered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:accessPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceResource.xwt
index 02e42020c66..318be9a88fc 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDeviceResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="DeviceResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="DeviceResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDimension.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDimension.xwt
index c42fc0ff435..88ebad47c19 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDimension.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDimension.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Dimension">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiInteger input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:Dimension:baseExponent"></ppe:MultiInteger>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Dimension">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiInteger input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:Dimension:baseExponent"></ppe:MultiInteger>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDistribute.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDistribute.xwt
index 144a85c76ad..f4aad5bf290 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDistribute.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleDistribute.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="Distribute">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="Distribute">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleEntryPoint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleEntryPoint.xwt
index 31403ff9ad0..166f4ec17a8 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleEntryPoint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleEntryPoint.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="EntryPoint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:EntryPoint:isReentrant"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="EntryPoint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:EntryPoint:isReentrant"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleExpressionContext.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleExpressionContext.xwt
index 14a329aac32..a3678c982eb 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleExpressionContext.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleExpressionContext.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	text="ExpressionContext">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	text="ExpressionContext">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowPort.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowPort.xwt
index 92cd4e9edb2..5e5e798c05c 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowPort.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowPort.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="FlowPort">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:FlowPort:direction"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="FlowPort">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:FlowPort:direction"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowProperty.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowProperty.xwt
index 5daad908d30..6fd90d15f97 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowProperty.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowProperty.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="FlowProperty">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:FlowProperty:direction"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="FlowProperty">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:FlowProperty:direction"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowSpecification.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowSpecification.xwt
index c42d7b6c341..2394e7c6684 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowSpecification.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleFlowSpecification.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="FlowSpecification">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="FlowSpecification">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocatingBehavior.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocatingBehavior.xwt
index 0841d0ccd42..081f2c6b9f3 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocatingBehavior.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocatingBehavior.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="GCMInvocatingBehavior">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="GCMInvocatingBehavior">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocationAction.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocationAction.xwt
index 04f51446d07..754806fd62c 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocationAction.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMInvocationAction.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="GCMInvocationAction">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="GCMInvocationAction">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMTrigger.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMTrigger.xwt
index 982de18b7f7..f4912011e90 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMTrigger.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGCMTrigger.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="GCMTrigger">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="GCMTrigger">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAcqStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAcqStep.xwt
index 243e1007f5d..d677b07aab7 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAcqStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAcqStep.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:j="clr-namespace:java.lang" text="GaAcqStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:j="clr-namespace:java.lang" text="GaAcqStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAnalysisContext.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAnalysisContext.xwt
index ea676845db4..a3fc1cf5076 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAnalysisContext.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaAnalysisContext.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="GaAnalysisContext">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="GaAnalysisContext">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommChannel.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommChannel.xwt
index 50034800872..93bc1e67d3b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommChannel.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommChannel.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	text="GaCommChannel">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	text="GaCommChannel">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommHost.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommHost.xwt
index 9a00d918543..cf88432d313 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommHost.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommHost.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="GaCommHost">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="GaCommHost">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommStep.xwt
index dcfa21eb1b2..271ffe07a65 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaCommStep.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="GaCommStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="GaCommStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaEventTrace.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaEventTrace.xwt
index 14d8a4612ea..22462e4ffdb 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaEventTrace.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaEventTrace.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="GaEventTrace">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="GaEventTrace">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaExecHost.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaExecHost.xwt
index 6af240fa6ad..0f0f5156d59 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaExecHost.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaExecHost.xwt
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="GaExecHost">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="GaExecHost">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaLatencyObs.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaLatencyObs.xwt
index 8d3334aa0c0..a71405086eb 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaLatencyObs.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaLatencyObs.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	text="GaLatencyObs">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	text="GaLatencyObs">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRelStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRelStep.xwt
index 3d826ff78d3..5094a6475b2 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRelStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRelStep.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="GaRelStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="GaRelStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRequestedService.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRequestedService.xwt
index 55b1206bf13..a291dce3869 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRequestedService.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaRequestedService.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="GaRequestedService">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="GaRequestedService">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaResourcesPlatform.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaResourcesPlatform.xwt
index b81c6a31739..0582e4212d6 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaResourcesPlatform.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaResourcesPlatform.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:j="clr-namespace:java.lang" text="GaResourcesPlatform">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:j="clr-namespace:java.lang" text="GaResourcesPlatform">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaScenario.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaScenario.xwt
index f27734ff046..1b566dbdf84 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaScenario.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaScenario.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="GaScenario">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="GaScenario">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaStep.xwt
index 0a299d70252..88c425e0ef6 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaStep.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="GaStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="GaStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaTimedObs.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaTimedObs.xwt
index 48d756f2014..a0465a55480 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaTimedObs.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaTimedObs.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="GaTimedObs">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="GaTimedObs">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadBehavior.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadBehavior.xwt
index 8945e1f428e..cfae5b9c414 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadBehavior.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadBehavior.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="GaWorkloadBehavior">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="GaWorkloadBehavior">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadEvent.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadEvent.xwt
index 22886e2fdad..0f50278eb72 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadEvent.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadEvent.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="GaWorkloadEvent">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="GaWorkloadEvent">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadGenerator.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadGenerator.xwt
index de3da94d851..9803767d3a8 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadGenerator.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGaWorkloadGenerator.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="GaWorkloadGenerator">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="GaWorkloadGenerator">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGrService.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGrService.xwt
index 1b15d43a368..a1868c9071e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGrService.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleGrService.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="GrService">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="GrService">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWActuator.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWActuator.xwt
index cda135e7c97..ceb66f4ae1e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWActuator.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWActuator.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	text="HWActuator">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	text="HWActuator">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWSensor.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWSensor.xwt
index 122288b0876..57c249e85e6 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWSensor.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHWSensor.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="HWSensor">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="HWSensor">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwASIC.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwASIC.xwt
index fa69d804a59..0f8787a915e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwASIC.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwASIC.xwt
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="HwASIC">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="HwASIC">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwArbiter.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwArbiter.xwt
index 12e2257a73b..b6eb0a73bb2 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwArbiter.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwArbiter.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="HwArbiter">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="HwArbiter">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBranchPredictor.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBranchPredictor.xwt
index cb3528e4df9..bf0ef47462b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBranchPredictor.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBranchPredictor.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="HwBranchPredictor">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="HwBranchPredictor">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBridge.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBridge.xwt
index a56b33d355d..7d90fb622ed 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBridge.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBridge.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="HwBridge">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="HwBridge">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBus.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBus.xwt
index a3a1ef30342..e7a56bdf3e6 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBus.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwBus.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwBus">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwBus">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCache.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCache.xwt
index b53e154b755..cf090c840e9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCache.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCache.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwCache">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:writePolicy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:repl_Policy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:type"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwCache">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:writePolicy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:repl_Policy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:type"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwClock.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwClock.xwt
index 2b75716dfc4..b64934c1368 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwClock.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwClock.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwClock">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwClock">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCommunicationResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCommunicationResource.xwt
index ebcd666e1b1..6d22108dcf1 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCommunicationResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCommunicationResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwCommunicationResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwCommunicationResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComponent.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComponent.xwt
index a4395f734a7..5eb67efba33 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComponent.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComponent.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwComponent">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwComponent">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComputingResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComputingResource.xwt
index 303be4d055b..fb97e5a63e7 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComputingResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwComputingResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="HwComputingResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="HwComputingResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCoolingSupply.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCoolingSupply.xwt
index 8204938e5c6..9f2182d3335 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCoolingSupply.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwCoolingSupply.xwt
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="HwCoolingSupply">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="HwCoolingSupply">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDMA.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDMA.xwt
index 24180f71806..a35cf906dd6 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDMA.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDMA.xwt
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="HwDMA">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="HwDMA">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDevice.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDevice.xwt
index ad676e465b2..71e6e8bdbf9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDevice.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDevice.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwDevice">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwDevice">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDrive.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDrive.xwt
index afb924967c9..9ea89edeace 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDrive.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwDrive.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwDrive">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwDrive">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwEndPoint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwEndPoint.xwt
index 36786f212db..e686105e7cc 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwEndPoint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwEndPoint.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="HwEndPoint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="HwEndPoint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwISA.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwISA.xwt
index 50a4461624e..fc6306b895c 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwISA.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwISA.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="HwISA">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwISA:type"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="HwISA">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwISA:type"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwI_O.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwI_O.xwt
index 2d16e19096f..10ad087ed47 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwI_O.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwI_O.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwI_O">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwI_O">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMMU.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMMU.xwt
index da02110526e..642ad55b74b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMMU.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMMU.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="HwMMU">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="HwMMU">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMedia.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMedia.xwt
index ef2a54e8c97..76327e84d8b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMedia.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMedia.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwMedia">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwMedia">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMemory.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMemory.xwt
index d3790acb81a..faad1cd56ef 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMemory.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwMemory.xwt
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwMemory">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwMemory">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPLD.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPLD.xwt
index 4183325db4a..067eba0cfcd 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPLD.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPLD.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="HwPLD">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:technology"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="HwPLD">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:technology"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPowerSupply.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPowerSupply.xwt
index e75b512bdfd..fb48f9d4f5d 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPowerSupply.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwPowerSupply.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwPowerSupply">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwPowerSupply">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwProcessor.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwProcessor.xwt
index 9a8884b4ba6..fefdf8df7b2 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwProcessor.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwProcessor.xwt
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="HwProcessor">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="HwProcessor">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwRAM.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwRAM.xwt
index e95f16db7df..89da6524554 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwRAM.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwRAM.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="HwRAM">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:writePolicy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:repl_Policy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="HwRAM">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:writePolicy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:repl_Policy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwROM.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwROM.xwt
index abe54bf4340..fab0ccd53fd 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwROM.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwROM.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="HwROM">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwROM:type"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="HwROM">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwROM:type"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResource.xwt
index b898b960df0..52a2d24c2b1 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="HwResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="HwResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResourceService.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResourceService.xwt
index a496201ae3b..09cfdd509f2 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResourceService.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwResourceService.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="HwResourceService">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="HwResourceService">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwStorageManager.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwStorageManager.xwt
index c759480c862..36e8c95b47a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwStorageManager.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwStorageManager.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="HwStorageManager">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="HwStorageManager">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwSupport.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwSupport.xwt
index a1e6d327952..76c4c62e993 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwSupport.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwSupport.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwSupport">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwSupport">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimer.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimer.xwt
index 8d603d05d77..459cb44f3ad 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimer.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimer.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	text="HwTimer">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	text="HwTimer">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimingResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimingResource.xwt
index 9db12ae07f2..cfab2919717 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimingResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleHwTimingResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwTimingResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwTimingResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterRepetition.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterRepetition.xwt
index e7d0ed82bf9..5eb8d3418eb 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterRepetition.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterRepetition.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="InterRepetition">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:InterRepetition:isModulo"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="InterRepetition">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:InterRepetition:isModulo"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterruptResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterruptResource.xwt
index 82d804ff216..140b20ba6ac 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterruptResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleInterruptResource.xwt
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="InterruptResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:isMaskable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="InterruptResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:isMaskable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleIntervalType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleIntervalType.xwt
index 5a6c1f694af..31ebbaef2fd 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleIntervalType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleIntervalType.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="IntervalType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="IntervalType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleLinkTopology.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleLinkTopology.xwt
index 4548aa8b845..c07cc9de830 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleLinkTopology.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleLinkTopology.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="LinkTopology">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="LinkTopology">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryBroker.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryBroker.xwt
index f098a1cc290..be159e8bd4e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryBroker.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryBroker.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="MemoryBroker">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:accessPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="MemoryBroker">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:accessPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryPartition.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryPartition.xwt
index 76f72e11472..fc526c33eaf 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryPartition.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMemoryPartition.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="MemoryPartition">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="MemoryPartition">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMessageComResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMessageComResource.xwt
index 20bd5bca5e2..06219aa4b08 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMessageComResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMessageComResource.xwt
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="MessageComResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:isFixedMessageSize"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:messageQueuePolicy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:mechanism"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="MessageComResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:isFixedMessageSize"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:messageQueuePolicy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:mechanism"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMode.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMode.xwt
index bd802b2021d..6f5f473cc34 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMode.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMode.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="Mode">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="Mode">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeBehavior.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeBehavior.xwt
index 9792a75fc10..5e2f0d19034 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeBehavior.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeBehavior.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="ModeBehavior">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="ModeBehavior">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeTransition.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeTransition.xwt
index af3a225337d..042a67c6f73 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeTransition.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleModeTransition.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="ModeTransition">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="ModeTransition">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMutualExclusionResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMutualExclusionResource.xwt
index b329a274143..6246c6fb483 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMutualExclusionResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleMutualExclusionResource.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="MutualExclusionResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="MutualExclusionResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfp.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfp.xwt
index eab74c8274b..e2fb3df23ae 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfp.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfp.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="Nfp">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="Nfp">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpConstraint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpConstraint.xwt
index 179c620d76a..424226b4d33 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpConstraint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpConstraint.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="NfpConstraint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="NfpConstraint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpRefine.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpRefine.xwt
index a187e9c7002..bf4be138931 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpRefine.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpRefine.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="NfpRefine">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="NfpRefine">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpType.xwt
index acb6259395e..7a1917e81d0 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNfpType.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="NfpType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="NfpType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNotificationResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNotificationResource.xwt
index 1d065c7593c..3c1bf60ab72 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNotificationResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleNotificationResource.xwt
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="NotificationResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:occurence"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:mechanism"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="NotificationResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:occurence"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:mechanism"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleOperator.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleOperator.xwt
index 17a1945d780..031004be3bc 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleOperator.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleOperator.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="Operator">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="Operator">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaCommStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaCommStep.xwt
index f67b0e41eee..1a17d888e7e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaCommStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaCommStep.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="PaCommStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="PaCommStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaLogicalResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaLogicalResource.xwt
index bf4569a06e6..d1a1ce1f558 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaLogicalResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaLogicalResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="PaLogicalResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="PaLogicalResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRequestedStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRequestedStep.xwt
index 3cf937ab16a..c3fd432d818 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRequestedStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRequestedStep.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="PaRequestedStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="PaRequestedStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaResPassStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaResPassStep.xwt
index 4ec3e909440..73463f453a6 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaResPassStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaResPassStep.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="PaResPassStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="PaResPassStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRunTInstance.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRunTInstance.xwt
index 015f4b973cb..11c645379d0 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRunTInstance.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaRunTInstance.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="PaRunTInstance">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:unbddPool"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="PaRunTInstance">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:unbddPool"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaStep.xwt
index fa634a1150c..99a260872a9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePaStep.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="PaStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="PaStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePpUnit.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePpUnit.xwt
index 763e6209f6f..ffce220f132 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePpUnit.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultiplePpUnit.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets"

-	text="PpUnit">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:PpUnit:concPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets"
+	text="PpUnit">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:PpUnit:concPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleProcessingResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleProcessingResource.xwt
index 25d01a04033..4603a755560 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleProcessingResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleProcessingResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="ProcessingResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="ProcessingResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRelease.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRelease.xwt
index 01e2ee0d52a..214bf4c810b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRelease.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRelease.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt" text="Release">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:x="http://www.eclipse.org/xwt" text="Release">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleReshape.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleReshape.xwt
index 3dbce030da3..4d6db3f3a76 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleReshape.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleReshape.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="Reshape">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="Reshape">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleResource.xwt
index 7cc15d3af9d..9a6aa6d7566 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="Resource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="Resource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleResourceUsage.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleResourceUsage.xwt
index e1e25160669..fecc4e4e84d 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleResourceUsage.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleResourceUsage.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="ResourceUsage">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="ResourceUsage">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtAction.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtAction.xwt
index 4393ed0aba1..bb4d672e8ed 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtAction.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtAction.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:j="clr-namespace:java.lang" text="RtAction">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtAction:isAtomic"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtAction:synchKind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:j="clr-namespace:java.lang" text="RtAction">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtAction:isAtomic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtAction:synchKind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtFeature.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtFeature.xwt
index af0a966dd9a..dd3b1c09df0 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtFeature.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtFeature.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="RtFeature">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="RtFeature">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtService.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtService.xwt
index b4903b5fa6f..97b80d6e587 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtService.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtService.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="RtService">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtService:isAtomic"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtService:concPolicy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtService:exeKind"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtService:synchKind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="RtService">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtService:isAtomic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtService:concPolicy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtService:exeKind"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtService:synchKind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtSpecification.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtSpecification.xwt
index 37cfee6c257..9468fc52e4c 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtSpecification.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtSpecification.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="RtSpecification">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="RtSpecification">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtUnit.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtUnit.xwt
index fbda8598702..3cfc5f757f1 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtUnit.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleRtUnit.xwt
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="RtUnit">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:isMain"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:isDynamic"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:srPoolSize"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:queueSize"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:queueSchedPolicy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:srPoolPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="RtUnit">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:isMain"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:isDynamic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:srPoolSize"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:queueSize"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:queueSchedPolicy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:srPoolPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaAnalysisContext.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaAnalysisContext.xwt
index cc9be144077..8a032196951 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaAnalysisContext.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaAnalysisContext.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="SaAnalysisContext">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaAnalysisContext:optCriterion"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="SaAnalysisContext">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaAnalysisContext:optCriterion"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommHost.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommHost.xwt
index 2d9a979651a..6ab7b247c1e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommHost.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommHost.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="SaCommHost">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="SaCommHost">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommStep.xwt
index 2852dbf4a19..abcb1b85c9c 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaCommStep.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="SaCommStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="SaCommStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaEndtoEndFlow.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaEndtoEndFlow.xwt
index 743df5269a4..9e610fc5601 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaEndtoEndFlow.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaEndtoEndFlow.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="SaEndtoEndFlow">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="SaEndtoEndFlow">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaExecHost.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaExecHost.xwt
index 2cc766d978f..c3572299cec 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaExecHost.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaExecHost.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="SaExecHost">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="SaExecHost">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSchedObs.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSchedObs.xwt
index 848541a999d..36563ecef2a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSchedObs.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSchedObs.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="SaSchedObs">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="SaSchedObs">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSharedResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSharedResource.xwt
index 5c25e03628d..9e1d8ab91a9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSharedResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaSharedResource.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="SaSharedResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="SaSharedResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaStep.xwt
index 0f75daf06e2..d131a18eda0 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSaStep.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="SaStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="SaStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSchedulableResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSchedulableResource.xwt
index 32a9fd27aad..0ec0e5ed611 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSchedulableResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSchedulableResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="SchedulableResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="SchedulableResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleScheduler.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleScheduler.xwt
index 69e2625fb15..e7b2dcb2faf 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleScheduler.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleScheduler.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="Scheduler">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="Scheduler">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSecondaryScheduler.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSecondaryScheduler.xwt
index edcb910a246..8bfee94a689 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSecondaryScheduler.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSecondaryScheduler.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="SecondaryScheduler">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="SecondaryScheduler">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleShaped.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleShaped.xwt
index 65f1493b795..03fac962900 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleShaped.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleShaped.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="Shaped">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="Shaped">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSharedDataComResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSharedDataComResource.xwt
index 073da9ff03a..6c520fbde28 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSharedDataComResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSharedDataComResource.xwt
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="SharedDataComResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="SharedDataComResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleStorageResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleStorageResource.xwt
index 2c4c367847f..e50c4b6b661 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleStorageResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleStorageResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="StorageResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="StorageResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwAccessService.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwAccessService.xwt
index c1476327b44..01309e9d08f 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwAccessService.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwAccessService.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="SwAccessService">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwAccessService:isModifier"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="SwAccessService">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwAccessService:isModifier"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwCommunicationResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwCommunicationResource.xwt
index 88456b5cd94..4f35bd0544a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwCommunicationResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwCommunicationResource.xwt
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="SwCommunicationResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="SwCommunicationResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwConcurrentResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwConcurrentResource.xwt
index c180ebb886c..504077c80a5 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwConcurrentResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwConcurrentResource.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="SwConcurrentResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="SwConcurrentResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwInteractionResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwInteractionResource.xwt
index 4874e799705..62164f04b8f 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwInteractionResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwInteractionResource.xwt
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="SwInteractionResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="SwInteractionResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwMutualExclusionResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwMutualExclusionResource.xwt
index b677cfb328b..8d3f30394b8 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwMutualExclusionResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwMutualExclusionResource.xwt
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="SwMutualExclusionResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:concurrentAccessProtocol"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:mechanism"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="SwMutualExclusionResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:concurrentAccessProtocol"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:mechanism"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwResource.xwt
index de5096d2b31..54596baf526 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="SwResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="SwResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSchedulableResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSchedulableResource.xwt
index 202b82ddae5..55a68a37a11 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSchedulableResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSchedulableResource.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="SwSchedulableResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:isStaticSchedulingFeature"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:isPreemptable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="SwSchedulableResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:isStaticSchedulingFeature"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:isPreemptable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSynchronizationResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSynchronizationResource.xwt
index 4accc71a4c6..49c00d5c40b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSynchronizationResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwSynchronizationResource.xwt
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="SwSynchronizationResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="SwSynchronizationResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwTimerResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwTimerResource.xwt
index 46628b50a91..5a205ed5880 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwTimerResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSwTimerResource.xwt
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="SwTimerResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:TimerResource:isPeriodic"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="SwTimerResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:TimerResource:isPeriodic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSynchronizationResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSynchronizationResource.xwt
index 9783d6d67cb..330f3ef8b63 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSynchronizationResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleSynchronizationResource.xwt
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="SynchronizationResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="SynchronizationResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTiler.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTiler.xwt
index d6af6896c82..8c3fc322ef2 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTiler.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTiler.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="Tiler">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="Tiler">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedConstraint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedConstraint.xwt
index c84320ad9e5..69fad1cb4b6 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedConstraint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedConstraint.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="TimedConstraint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedConstraint:interpretation"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="TimedConstraint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedConstraint:interpretation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDomain.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDomain.xwt
index 67969fa66c6..e3c92500390 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDomain.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDomain.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="TimedDomain">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="TimedDomain">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDurationObservation.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDurationObservation.xwt
index 0832c25bc41..9dc23a903fb 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDurationObservation.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedDurationObservation.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets"

-	text="TimedDurationObservation">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:InvalidWidget input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedDurationObservation:obsKind"></ppe:InvalidWidget>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets"
+	text="TimedDurationObservation">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:InvalidWidget input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedDurationObservation:obsKind"></ppe:InvalidWidget>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedElement.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedElement.xwt
index e1369895ef2..f903e85df89 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedElement.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedElement.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="TimedElement">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="TimedElement">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedEvent.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedEvent.xwt
index 917b308c23b..4782783093f 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedEvent.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedEvent.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="TimedEvent">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedEvent:repetition"></ppe:IntegerEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="TimedEvent">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedEvent:repetition"></ppe:IntegerEditor>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedInstantObservation.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedInstantObservation.xwt
index 197b01ee02b..0ff016ba962 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedInstantObservation.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedInstantObservation.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="TimedInstantObservation">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedInstantObservation:obsKind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="TimedInstantObservation">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedInstantObservation:obsKind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedProcessing.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedProcessing.xwt
index e961118fc6e..e27bb8005cd 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedProcessing.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedProcessing.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="TimedProcessing">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="TimedProcessing">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedValueSpecification.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedValueSpecification.xwt
index b0b7c48ec1d..5917e240e97 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedValueSpecification.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimedValueSpecification.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="TimedValueSpecification">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedValueSpecification:interpretation"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="TimedValueSpecification">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedValueSpecification:interpretation"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimerResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimerResource.xwt
index 3e2d0668b41..00a95b3daa4 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimerResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimerResource.xwt
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="TimerResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:TimerResource:isPeriodic"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="TimerResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:TimerResource:isPeriodic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimingResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimingResource.xwt
index 7e853b0ee27..fdfbad39a80 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimingResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTimingResource.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	text="TimingResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	text="TimingResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTupleType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTupleType.xwt
index baf07e7f2ca..7c67437e99d 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTupleType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleTupleType.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="TupleType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="TupleType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleUnit.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleUnit.xwt
index a4a111db0a7..253c4f0884c 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleUnit.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleUnit.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	text="Unit">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	text="Unit">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleVar.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleVar.xwt
index d2e33f26050..564203eb669 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleVar.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/MultipleVar.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Var">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:Variables:Var:dir"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Var">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:Variables:Var:dir"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAcquire.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAcquire.xwt
index 638da0d3bfa..1b5082eafaf 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAcquire.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAcquire.xwt
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="Acquire">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Acquire:isBlocking"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:GrService:owner"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="Acquire">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Acquire:isBlocking"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:GrService:owner"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAlarm.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAlarm.xwt
index 5f97c97a35a..4c1d9bd9dd1 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAlarm.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAlarm.xwt
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="Alarm">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:type"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:Alarm:isWatchdog"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:isMaskable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:Alarm:timers"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:periodElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:entryPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:terminateServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:heapSizeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:shareDataResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activateServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:priorityElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:stackSizeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:notificationResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:resumeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:disableConcurrencyServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:messageResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:enableConcurrencyServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:mutualExclusionResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:suspendServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:adressSpace"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:vectorElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:routineConnectServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:routineDisconnectServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:maskElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="Alarm">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:type"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:Alarm:isWatchdog"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:isMaskable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:Alarm:timers"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:periodElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:entryPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:terminateServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:heapSizeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:shareDataResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activateServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:priorityElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:stackSizeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:notificationResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:resumeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:disableConcurrencyServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:messageResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:enableConcurrencyServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:mutualExclusionResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:suspendServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:adressSpace"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:vectorElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:routineConnectServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:routineDisconnectServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:maskElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocate.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocate.xwt
index cff570bd972..0d051779358 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocate.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocate.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Allocate">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:impliedConstraint"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Allocate">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:impliedConstraint"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocateActivityGroup.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocateActivityGroup.xwt
index 27735fca846..ef07f8e9515 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocateActivityGroup.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocateActivityGroup.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	text="AllocateActivityGroup">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:AllocateActivityGroup:isUnique"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	text="AllocateActivityGroup">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:AllocateActivityGroup:isUnique"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocated.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocated.xwt
index ee178ba2c18..2d5b1ac73b5 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocated.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAllocated.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets"

-	text="Allocated">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocated:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets"
+	text="Allocated">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocated:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAssign.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAssign.xwt
index 575ed8a06f5..55a16bbb308 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAssign.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleAssign.xwt
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="Assign">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Assign:kind"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Assign:nature"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Assign:from"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Assign:impliedConstraint"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Assign:to"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="Assign">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Assign:kind"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Assign:nature"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Assign:from"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Assign:impliedConstraint"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Assign:to"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleBoundedSubtype.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleBoundedSubtype.xwt
index 6c7a15b9e4b..53d89ba3448 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleBoundedSubtype.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleBoundedSubtype.xwt
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="BoundedSubtype">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:maxValue"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:minValue"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:isMaxOpen"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:isMinOpen"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:baseType"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="BoundedSubtype">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:maxValue"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:minValue"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:isMaxOpen"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:isMinOpen"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:BoundedSubtype:baseType"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleChoiceType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleChoiceType.xwt
index 341e135d2c3..5b6e599015e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleChoiceType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleChoiceType.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="ChoiceType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:ChoiceType:defaultAttrib"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:ChoiceType:choiceAttrib"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="ChoiceType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:ChoiceType:defaultAttrib"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:ChoiceType:choiceAttrib"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerFeature.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerFeature.xwt
index 103163b9723..e92ef945b68 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerFeature.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerFeature.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	text="ClientServerFeature">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:ClientServerFeature:kind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	text="ClientServerFeature">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:ClientServerFeature:kind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerPort.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerPort.xwt
index 6d95eac8979..4785ac21129 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerPort.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerPort.xwt
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="ClientServerPort">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:ClientServerPort:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:ClientServerPort:featuresSpec"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:ClientServerPort:provInterface"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:ClientServerPort:reqInterface"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="ClientServerPort">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:ClientServerPort:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:ClientServerPort:featuresSpec"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:ClientServerPort:provInterface"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:ClientServerPort:reqInterface"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerSpecification.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerSpecification.xwt
index 55e9c777b93..5afe8cf8b81 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerSpecification.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClientServerSpecification.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="ClientServerSpecification">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="ClientServerSpecification">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClock.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClock.xwt
index 99d39811044..9f7d45c4e4f 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClock.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClock.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="Clock">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:Clock:standard"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:Clock:unit"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:Clock:type"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="Clock">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:Clock:standard"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:Clock:unit"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:Clock:type"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockConstraint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockConstraint.xwt
index 9e17cc8d8e4..8a6407f25df 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockConstraint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockConstraint.xwt
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	text="ClockConstraint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isCoincidenceBased"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isPrecedenceBased"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isChronometricBased"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedElement:on"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	text="ClockConstraint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isCoincidenceBased"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isPrecedenceBased"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockConstraint:isChronometricBased"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedElement:on"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockResource.xwt
index 624a0341a00..66dc09d4772 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockResource.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="ClockResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="ClockResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockType.xwt
index 5c543fe60cb..0d3878265a0 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleClockType.xwt
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	text="ClockType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:isLogical"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:nature"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:getTime"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:offsetAttr"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:indexToValue"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:maxValAttr"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:resolAttr"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:setTime"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:ClockType:unitType"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	text="ClockType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:isLogical"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:nature"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:getTime"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:offsetAttr"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:indexToValue"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:maxValAttr"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:resolAttr"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:setTime"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:ClockType:unitType"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCollectionType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCollectionType.xwt
index 571eb4e966f..5514e4685ed 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCollectionType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCollectionType.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	text="CollectionType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:CollectionType:collectionAttrib"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	text="CollectionType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:CollectionType:collectionAttrib"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationEndPoint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationEndPoint.xwt
index 5c12985c0ad..e92a273bdcb 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationEndPoint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationEndPoint.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="CommunicationEndPoint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationEndPoint:packetSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="CommunicationEndPoint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationEndPoint:packetSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationMedia.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationMedia.xwt
index 0692a85da19..a27992b4f35 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationMedia.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleCommunicationMedia.xwt
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="CommunicationMedia">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="CommunicationMedia">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleComputingResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleComputingResource.xwt
index 2347d7b464a..31fff7de7e4 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleComputingResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleComputingResource.xwt
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	text="ComputingResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	text="ComputingResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleConcurrencyResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleConcurrencyResource.xwt
index 0a8b34d7c23..a6288654c3b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleConcurrencyResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleConcurrencyResource.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="ConcurrencyResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="ConcurrencyResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleConfiguration.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleConfiguration.xwt
index 1b8d5802fb9..e09e55431e8 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleConfiguration.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleConfiguration.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Configuration">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:CoreElements:Configuration:mode"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Configuration">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:CoreElements:Configuration:mode"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDataEvent.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDataEvent.xwt
index f2b58675d0f..a070ced6183 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDataEvent.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDataEvent.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="DataEvent">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:DataEvent:classifier"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="DataEvent">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:DataEvent:classifier"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDataPool.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDataPool.xwt
index 23120800860..30b999d77a4 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDataPool.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDataPool.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets"

-	text="DataPool">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:DataPool:ordering"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:DataPool:insertion"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:DataPool:selection"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets"
+	text="DataPool">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:DataPool:ordering"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:DataPool:insertion"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:DataPool:selection"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDefaultLink.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDefaultLink.xwt
index ca8a106c8b0..a23aeede2b9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDefaultLink.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDefaultLink.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="DefaultLink">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="DefaultLink">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceBroker.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceBroker.xwt
index 605efc7b04b..5a2c1153617 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceBroker.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceBroker.xwt
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="DeviceBroker">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:isBuffered"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:accessPolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:writeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:readServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:devices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:closeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:controlServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:openServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="DeviceBroker">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:isBuffered"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:accessPolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:writeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:readServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:devices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:closeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:controlServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:DeviceBroker:openServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceResource.xwt
index 40b5b32f498..ffe66808171 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDeviceResource.xwt
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="DeviceResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="DeviceResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDimension.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDimension.xwt
index 8a73ccb2ae6..15c3865579a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDimension.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDimension.xwt
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="Dimension">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:Dimension:symbol"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiInteger input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:Dimension:baseExponent"></ppe:MultiInteger>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:Dimension:baseDimension"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="Dimension">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:Dimension:symbol"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiInteger input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:Dimension:baseExponent"></ppe:MultiInteger>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:Dimension:baseDimension"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDistribute.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDistribute.xwt
index 27839fd2a50..dbdd3695e63 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDistribute.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleDistribute.xwt
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="Distribute">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Distribute:fromTiler"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Distribute:repetitionSpace"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Distribute:toTiler"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Distribute:patternShape"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:impliedConstraint"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="Distribute">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Distribute:fromTiler"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Distribute:repetitionSpace"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Distribute:toTiler"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Distribute:patternShape"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:impliedConstraint"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleEntryPoint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleEntryPoint.xwt
index c55b5311768..72ee6b4cf90 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleEntryPoint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleEntryPoint.xwt
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="EntryPoint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:EntryPoint:isReentrant"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:EntryPoint:routine"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:Allocate:impliedConstraint"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="EntryPoint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:EntryPoint:isReentrant"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:nature"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:EntryPoint:routine"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:Allocate:impliedConstraint"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleExpressionContext.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleExpressionContext.xwt
index 292abfe4880..c30f907e63e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleExpressionContext.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleExpressionContext.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="ExpressionContext">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="ExpressionContext">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowPort.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowPort.xwt
index 2efa7a1bc33..8edb1cac71b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowPort.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowPort.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="FlowPort">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:FlowPort:direction"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="FlowPort">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:FlowPort:direction"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowProperty.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowProperty.xwt
index 03d5e80ba29..fe4e8a39e17 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowProperty.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowProperty.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	text="FlowProperty">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:FlowProperty:direction"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	text="FlowProperty">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:FlowProperty:direction"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowSpecification.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowSpecification.xwt
index e72919b9eda..485793c7666 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowSpecification.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleFlowSpecification.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="FlowSpecification">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="FlowSpecification">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocatingBehavior.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocatingBehavior.xwt
index 8846b1405c6..15c9ec3b6f4 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocatingBehavior.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocatingBehavior.xwt
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="GCMInvocatingBehavior">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:GCMInvocatingBehavior:invocations"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:GCMInvocatingBehavior:onPorts"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:GCMInvocatingBehavior:onFeatures"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="GCMInvocatingBehavior">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:GCMInvocatingBehavior:invocations"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:GCMInvocatingBehavior:onPorts"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:GCMInvocatingBehavior:onFeatures"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocationAction.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocationAction.xwt
index d4d96626f0f..a6976ef0c83 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocationAction.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMInvocationAction.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	text="GCMInvocationAction">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:GCMInvocationAction:onFeature"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	text="GCMInvocationAction">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:GCMInvocationAction:onFeature"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMTrigger.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMTrigger.xwt
index f035442f9bb..28153ab5382 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMTrigger.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGCMTrigger.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="GCMTrigger">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:GCM:GCMTrigger:feature"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="GCMTrigger">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:GCM:GCMTrigger:feature"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAcqStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAcqStep.xwt
index 8c2ca2bd515..59a59448968 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAcqStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAcqStep.xwt
@@ -1,103 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="GaAcqStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaAcqStep:resUnits"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaAcqStep:acqRes"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="GaAcqStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaAcqStep:resUnits"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaAcqStep:acqRes"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAnalysisContext.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAnalysisContext.xwt
index 2d6d4ebf4b6..58e5d2ba379 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAnalysisContext.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaAnalysisContext.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="GaAnalysisContext">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:context"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:CoreElements:Configuration:mode"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:workload"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:platform"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="GaAnalysisContext">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:context"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:CoreElements:Configuration:mode"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:workload"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:platform"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommChannel.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommChannel.xwt
index e3ca79a707e..0d8ae32b416 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommChannel.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommChannel.xwt
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="GaCommChannel">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommChannel:utilization"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommChannel:packetSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:dependentScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:schedParams"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="GaCommChannel">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommChannel:utilization"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommChannel:packetSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:dependentScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:schedParams"></ppe:MultiString>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommHost.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommHost.xwt
index 90557b9b251..d53a0172581 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommHost.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommHost.xwt
@@ -1,75 +1,75 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="GaCommHost">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommHost:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommHost:throughput"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="GaCommHost">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommHost:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommHost:throughput"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommStep.xwt
index 6c029cd24eb..8bb77a83caa 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaCommStep.xwt
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="GaCommStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="GaCommStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaEventTrace.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaEventTrace.xwt
index f578419fce2..25881fee203 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaEventTrace.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaEventTrace.xwt
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="GaEventTrace">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaEventTrace:content"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaEventTrace:format"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaEventTrace:location"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="GaEventTrace">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaEventTrace:content"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaEventTrace:format"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaEventTrace:location"></ppe:StringEditor>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaExecHost.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaExecHost.xwt
index 0ab36cfb68a..b5295318441 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaExecHost.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaExecHost.xwt
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets"

-	text="GaExecHost">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:schedPriRange"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:cntxtSwT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:clockOvh"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:commRcvOvh"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:commTxOvh"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:memSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:throughput"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:utilization"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets"
+	text="GaExecHost">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:schedPriRange"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:cntxtSwT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:clockOvh"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:commRcvOvh"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:commTxOvh"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:memSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:throughput"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:utilization"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaLatencyObs.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaLatencyObs.xwt
index 21477436e58..be13252c5bd 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaLatencyObs.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaLatencyObs.xwt
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="GaLatencyObs">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaLatencyObs:utility"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaLatencyObs:miss"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaLatencyObs:latency"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaLatencyObs:maxJitter"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:startObs"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:endObs"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="GaLatencyObs">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaLatencyObs:utility"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaLatencyObs:miss"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaLatencyObs:latency"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaLatencyObs:maxJitter"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:startObs"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:endObs"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRelStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRelStep.xwt
index 12fb95d2c07..b0dee3d0bf0 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRelStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRelStep.xwt
@@ -1,103 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="GaRelStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaRelStep:resUnits"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaRelStep:relRes"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="GaRelStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaRelStep:resUnits"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaRelStep:relRes"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRequestedService.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRequestedService.xwt
index 2292be786aa..5e1e4a5921c 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRequestedService.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaRequestedService.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="GaRequestedService">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="GaRequestedService">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaResourcesPlatform.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaResourcesPlatform.xwt
index fd1b8a49540..d35e1061679 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaResourcesPlatform.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaResourcesPlatform.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="GaResourcesPlatform">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaResourcesPlatform:resources"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="GaResourcesPlatform">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaResourcesPlatform:resources"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaScenario.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaScenario.xwt
index cb19e4aafae..5d3f1802ad7 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaScenario.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaScenario.xwt
@@ -1,70 +1,70 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="GaScenario">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="GaScenario">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaStep.xwt
index 70caedec3ca..b80134fa9c8 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaStep.xwt
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	text="GaStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	text="GaStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaTimedObs.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaTimedObs.xwt
index 7d6d3f9c2c7..f78948693de 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaTimedObs.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaTimedObs.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="GaTimedObs">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:startObs"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:endObs"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="GaTimedObs">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:startObs"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:endObs"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadBehavior.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadBehavior.xwt
index 52e3a080e0c..11695befd07 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadBehavior.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadBehavior.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="GaWorkloadBehavior">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadBehavior:behavior"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadBehavior:demand"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="GaWorkloadBehavior">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadBehavior:behavior"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadBehavior:demand"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadEvent.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadEvent.xwt
index 572b9288cb3..9ba91b6f43a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadEvent.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadEvent.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="GaWorkloadEvent">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadEvent:pattern"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadEvent:trace"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadEvent:effect"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadEvent:generator"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadEvent:timedEvent"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="GaWorkloadEvent">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadEvent:pattern"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadEvent:trace"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadEvent:effect"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadEvent:generator"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadEvent:timedEvent"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadGenerator.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadGenerator.xwt
index 04aeec16f60..a86c6c42566 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadGenerator.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGaWorkloadGenerator.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="GaWorkloadGenerator">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadGenerator:pop"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="GaWorkloadGenerator">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaWorkloadGenerator:pop"></ppe:StringEditor>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGrService.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGrService.xwt
index 94b63f6ba15..9c504eb2943 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGrService.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleGrService.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="GrService">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:GrService:owner"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="GrService">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:GrService:owner"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHWActuator.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHWActuator.xwt
index 0ed51ecb192..426e02843c0 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHWActuator.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHWActuator.xwt
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HWActuator">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HWActuator">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHWSensor.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHWSensor.xwt
index 7a872f93718..ded1efdcbae 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHWSensor.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHWSensor.xwt
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="HWSensor">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="HWSensor">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwASIC.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwASIC.xwt
index 7388bf5b48e..536ae95417f 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwASIC.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwASIC.xwt
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="HwASIC">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwComputingResource:op_Frequencies"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="HwASIC">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwComputingResource:op_Frequencies"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwArbiter.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwArbiter.xwt
index 3e00599a656..475d6e5db3b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwArbiter.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwArbiter.xwt
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="HwArbiter">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwArbiter:controlledMedias"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="HwArbiter">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwArbiter:controlledMedias"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBranchPredictor.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBranchPredictor.xwt
index 3b0daf7b02c..f2c99bac06b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBranchPredictor.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBranchPredictor.xwt
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwBranchPredictor">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwBranchPredictor">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBridge.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBridge.xwt
index 3afeec83391..2545aa7cf86 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBridge.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBridge.xwt
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwBridge">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:bandWidth"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:arbiters"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwBridge:sides"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwBridge">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:bandWidth"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:arbiters"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwBridge:sides"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBus.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBus.xwt
index 6a3837f3367..d7fff1976ac 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBus.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwBus.xwt
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwBus">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:bandWidth"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwBus:isSynchronous"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwBus:isSerial"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwBus:wordWidth"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwBus:adressWidth"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:arbiters"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwBus">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:bandWidth"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwBus:isSynchronous"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwBus:isSerial"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwBus:wordWidth"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwBus:adressWidth"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:arbiters"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCache.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCache.xwt
index 91bd0678cb0..eb82bcebc50 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCache.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCache.xwt
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="HwCache">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:level"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:structure"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:adressSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:throughput"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:memorySize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:writePolicy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:repl_Policy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:type"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:timings"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="HwCache">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:level"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:structure"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:adressSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:throughput"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:memorySize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:writePolicy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:repl_Policy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwCache:type"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:timings"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwClock.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwClock.xwt
index 35698d0a650..1642bea822b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwClock.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwClock.xwt
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	text="HwClock">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	text="HwClock">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCommunicationResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCommunicationResource.xwt
index 9e1f1094b81..39b9f506603 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCommunicationResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCommunicationResource.xwt
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="HwCommunicationResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="HwCommunicationResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComponent.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComponent.xwt
index 869ea5195f8..3f52dbf3e37 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComponent.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComponent.xwt
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	text="HwComponent">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticConsumption"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:weight"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:price"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticDissipation"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:nbPins"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:r_Conditions"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:dimensions"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:position"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:grid"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:poweredServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:subComponents"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	text="HwComponent">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticConsumption"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:weight"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:price"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticDissipation"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:nbPins"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:r_Conditions"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:dimensions"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:position"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:grid"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:poweredServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:subComponents"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComputingResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComputingResource.xwt
index fe8babca7bf..ac9ebe86d82 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComputingResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwComputingResource.xwt
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwComputingResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwComputingResource:op_Frequencies"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwComputingResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwComputingResource:op_Frequencies"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCoolingSupply.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCoolingSupply.xwt
index a3a2959fcca..a7cd1279a15 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCoolingSupply.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwCoolingSupply.xwt
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="HwCoolingSupply">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticConsumption"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:weight"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:price"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticDissipation"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:nbPins"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwPower:HwCoolingSupply:coolingPower"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:r_Conditions"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:dimensions"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:position"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:grid"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:poweredServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:subComponents"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="HwCoolingSupply">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticConsumption"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:weight"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:price"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticDissipation"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:nbPins"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwPower:HwCoolingSupply:coolingPower"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:r_Conditions"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:dimensions"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:position"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:grid"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:poweredServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:subComponents"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDMA.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDMA.xwt
index e52358e71e6..a17abdb90cf 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDMA.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDMA.xwt
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwDMA">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwDMA:transferWidth"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwDMA:nbChannels"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwArbiter:controlledMedias"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwDMA:drivenBy"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwStorageManager:managedMemories"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwDMA">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwDMA:transferWidth"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwDMA:nbChannels"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwArbiter:controlledMedias"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwDMA:drivenBy"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwStorageManager:managedMemories"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDevice.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDevice.xwt
index 14de3e91dde..4ded50ce7fb 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDevice.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDevice.xwt
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwDevice">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwDevice">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDrive.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDrive.xwt
index cf9f690468b..c3eeb46a533 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDrive.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwDrive.xwt
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="HwDrive">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:adressSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:throughput"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:memorySize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwDrive:sectorSize"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwDrive:buffer"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:timings"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="HwDrive">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:adressSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:throughput"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:memorySize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwDrive:sectorSize"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwDrive:buffer"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:timings"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwEndPoint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwEndPoint.xwt
index ce388ca770f..44abd5029e8 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwEndPoint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwEndPoint.xwt
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:j="clr-namespace:java.lang" text="HwEndPoint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationEndPoint:packetSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwEndPoint:connectedTo"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:j="clr-namespace:java.lang" text="HwEndPoint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationEndPoint:packetSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwEndPoint:connectedTo"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwISA.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwISA.xwt
index da00d9cd9c8..4b451c8d270 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwISA.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwISA.xwt
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="HwISA">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwISA:family"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwISA:inst_Width"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwISA:type"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="HwISA">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwISA:family"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwISA:inst_Width"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwISA:type"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwI_O.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwI_O.xwt
index d0b076d2873..812620b32d9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwI_O.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwI_O.xwt
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwI_O">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwI_O">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMMU.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMMU.xwt
index 7d467f2febd..58679fac547 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMMU.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMMU.xwt
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="HwMMU">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwMMU:memoryProtection"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwMMU:physicalAddrSpace"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwMMU:virtualAddrSpace"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwMMU:ownedTLBs"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwStorageManager:managedMemories"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="HwMMU">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwMMU:memoryProtection"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwMMU:physicalAddrSpace"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwMMU:virtualAddrSpace"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwMMU:ownedTLBs"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwStorageManager:managedMemories"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMedia.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMedia.xwt
index 61f0f1b44db..e5c3cdc9836 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMedia.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMedia.xwt
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="HwMedia">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:bandWidth"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:arbiters"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="HwMedia">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:bandWidth"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwCommunication:HwMedia:arbiters"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMemory.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMemory.xwt
index f1c6b8dc101..aa3dc5df71a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMemory.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwMemory.xwt
@@ -1,57 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="HwMemory">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:adressSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:throughput"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:memorySize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:timings"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="HwMemory">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:adressSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:throughput"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:memorySize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:timings"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPLD.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPLD.xwt
index 7aa6ea03e09..763609781b8 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPLD.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPLD.xwt
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="HwPLD">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwComputingResource:op_Frequencies"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:nbFlipFlops"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:nbLUTs"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:organization"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:ndLUT_Inputs"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:technology"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:blocksComputing"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:blocksRAM"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="HwPLD">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwComputingResource:op_Frequencies"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:nbFlipFlops"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:nbLUTs"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:organization"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:ndLUT_Inputs"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:technology"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:blocksComputing"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwPLD:blocksRAM"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPowerSupply.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPowerSupply.xwt
index 77557f617c9..cbdad92a39e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPowerSupply.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwPowerSupply.xwt
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwPowerSupply">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwPower:HwPowerSupply:capacity"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwPower:HwPowerSupply:suppliedPower"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticConsumption"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:weight"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:price"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticDissipation"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:nbPins"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:r_Conditions"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:dimensions"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:position"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:grid"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:poweredServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:subComponents"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwPowerSupply">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwPower:HwPowerSupply:capacity"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwPower:HwPowerSupply:suppliedPower"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticConsumption"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:weight"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:price"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:staticDissipation"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:nbPins"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:r_Conditions"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:dimensions"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:position"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:grid"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:poweredServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwPhysical:HwLayout:HwComponent:subComponents"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwProcessor.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwProcessor.xwt
index fc221719089..609ccc68caa 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwProcessor.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwProcessor.xwt
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="HwProcessor">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:nbCores"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:nbPipelines"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:nbALUs"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:mips"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:nbFPUs"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:nbStages"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwComputingResource:op_Frequencies"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:ownedMMUs"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:predictors"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:ownedISAs"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:caches"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="HwProcessor">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:nbCores"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:nbPipelines"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:nbALUs"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:mips"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:nbFPUs"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:nbStages"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwComputingResource:op_Frequencies"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:ownedMMUs"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:predictors"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:ownedISAs"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwComputing:HwProcessor:caches"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwRAM.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwRAM.xwt
index b01b64c2c29..5d8d1d6d654 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwRAM.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwRAM.xwt
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwRAM">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:adressSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:throughput"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:memorySize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:isStatic"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:isNonVolatile"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:isSynchronous"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:organization"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:writePolicy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:repl_Policy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:timings"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwRAM">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:adressSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:throughput"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:memorySize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:isStatic"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:isNonVolatile"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:isSynchronous"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:organization"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:writePolicy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwRAM:repl_Policy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:timings"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwROM.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwROM.xwt
index 226448dfffd..e0591e301fa 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwROM.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwROM.xwt
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="HwROM">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwROM:organization"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:adressSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:throughput"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:memorySize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwROM:type"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:timings"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="HwROM">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwROM:organization"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:adressSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:throughput"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:memorySize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwROM:type"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwMemory:HwMemory:timings"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResource.xwt
index 0cfcfffff92..b4096d8e039 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResource.xwt
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResourceService.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResourceService.xwt
index 66adc9d41a8..424f5ffd188 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResourceService.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwResourceService.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="HwResourceService">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResourceService:consumption"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResourceService:dissipation"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:GrService:owner"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="HwResourceService">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResourceService:consumption"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResourceService:dissipation"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:GrService:owner"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwStorageManager.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwStorageManager.xwt
index 77d6ebc96f1..07429a6a595 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwStorageManager.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwStorageManager.xwt
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="HwStorageManager">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwStorageManager:managedMemories"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="HwStorageManager">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwStorage:HwStorageManager:HwStorageManager:managedMemories"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwSupport.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwSupport.xwt
index 110aeaabbb2..1583ea4c3b9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwSupport.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwSupport.xwt
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="HwSupport">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="HwSupport">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimer.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimer.xwt
index 8130c18d34f..045cdda162a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimer.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimer.xwt
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="HwTimer">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwTiming:HwTimer:nbCounters"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwTiming:HwTimer:counterWidth"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwTiming:HwTimer:inputClock"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="HwTimer">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwTiming:HwTimer:nbCounters"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwTiming:HwTimer:counterWidth"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwLogical:HwTiming:HwTimer:inputClock"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimingResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimingResource.xwt
index 109c05ac847..598492aa9e8 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimingResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleHwTimingResource.xwt
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="HwTimingResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="HwTimingResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:frequency"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:description"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:endPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:r_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:p_HW_Services"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HRM:HwGeneral:HwResource:ownedHW"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleInterRepetition.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleInterRepetition.xwt
index b30035dbf21..8d853a58eef 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleInterRepetition.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleInterRepetition.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="InterRepetition">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:InterRepetition:repetitionShapeDependence"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:InterRepetition:isModulo"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="InterRepetition">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:InterRepetition:repetitionShapeDependence"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:InterRepetition:isModulo"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleInterruptResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleInterruptResource.xwt
index 7aa56a94aee..a5ae2320cd4 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleInterruptResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleInterruptResource.xwt
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="InterruptResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:type"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:isMaskable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:periodElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:entryPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:terminateServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:heapSizeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:shareDataResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activateServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:priorityElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:stackSizeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:notificationResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:resumeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:disableConcurrencyServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:messageResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:enableConcurrencyServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:mutualExclusionResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:suspendServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:adressSpace"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:vectorElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:routineConnectServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:routineDisconnectServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:maskElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="InterruptResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:type"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:isMaskable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:periodElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:entryPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:terminateServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:heapSizeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:shareDataResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activateServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:priorityElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:stackSizeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:notificationResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:resumeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:disableConcurrencyServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:messageResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:enableConcurrencyServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:mutualExclusionResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:suspendServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:adressSpace"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:vectorElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:routineConnectServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:routineDisconnectServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:InterruptResource:maskElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleIntervalType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleIntervalType.xwt
index 97179c3b3d5..3ba796d4ac6 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleIntervalType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleIntervalType.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="IntervalType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:IntervalType:intervalAttrib"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="IntervalType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:IntervalType:intervalAttrib"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleLinkTopology.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleLinkTopology.xwt
index 1cf60f2a1f6..a8231bb8aae 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleLinkTopology.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleLinkTopology.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="LinkTopology">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="LinkTopology">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryBroker.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryBroker.xwt
index bfaf873d211..17dda0320d9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryBroker.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryBroker.xwt
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="MemoryBroker">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:accessPolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:unMapServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:lockServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:memories"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:memoryBlockSizeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:memoryBlockAdressElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:mapServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:unlockServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="MemoryBroker">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:accessPolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:unMapServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:lockServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:memories"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:memoryBlockSizeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:memoryBlockAdressElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:mapServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Brokering:MemoryBroker:unlockServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryPartition.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryPartition.xwt
index 6267d1dbc31..df226f6c772 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryPartition.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMemoryPartition.xwt
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="MemoryPartition">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:MemoryPartition:fork"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:MemoryPartition:memorySpaces"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:MemoryPartition:concurrentResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:MemoryPartition:exit"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="MemoryPartition">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:MemoryPartition:fork"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:MemoryPartition:memorySpaces"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:MemoryPartition:concurrentResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:MemoryPartition:exit"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMessageComResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMessageComResource.xwt
index 9b6f8d43bd8..790e6fa58a6 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMessageComResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMessageComResource.xwt
@@ -1,95 +1,95 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="MessageComResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:isFixedMessageSize"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:messageQueuePolicy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:mechanism"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:messageQueueCapacityElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:receiveServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:messageSizeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:sendServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="MessageComResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:isFixedMessageSize"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:messageQueuePolicy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:mechanism"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:messageQueueCapacityElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:receiveServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:messageSizeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:MessageComResource:sendServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMode.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMode.xwt
index 5d98b0f34c4..538e379ab57 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMode.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMode.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="Mode">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="Mode">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleModeBehavior.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleModeBehavior.xwt
index 032e3e813e4..b417f1eb955 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleModeBehavior.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleModeBehavior.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:j="clr-namespace:java.lang" text="ModeBehavior">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:j="clr-namespace:java.lang" text="ModeBehavior">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleModeTransition.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleModeTransition.xwt
index 4c80c5c730f..6393d9449bf 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleModeTransition.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleModeTransition.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="ModeTransition">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="ModeTransition">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMutualExclusionResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMutualExclusionResource.xwt
index 6efc8303d64..5b0a4b645da 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMutualExclusionResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleMutualExclusionResource.xwt
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	text="MutualExclusionResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:ceiling"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:otherProtectProtocol"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:scheduler"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	text="MutualExclusionResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:ceiling"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:otherProtectProtocol"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:scheduler"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfp.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfp.xwt
index b74b99b2aa6..a22add4d653 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfp.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfp.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="Nfp">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="Nfp">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpConstraint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpConstraint.xwt
index d288080182a..0418ecae350 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpConstraint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpConstraint.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="NfpConstraint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="NfpConstraint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpRefine.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpRefine.xwt
index 542e0fd9bfd..f056dbca9ce 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpRefine.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpRefine.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="NfpRefine">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:Alloc:NfpRefine:constraint"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="NfpRefine">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:Alloc:NfpRefine:constraint"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpType.xwt
index da9b8f7c55b..c67ada0d18d 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNfpType.xwt
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="NfpType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpType:exprAttrib"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpType:valueAttrib"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpType:unitAttrib"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:TupleType:tupleAttrib"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="NfpType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpType:exprAttrib"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpType:valueAttrib"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpType:unitAttrib"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:TupleType:tupleAttrib"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNotificationResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNotificationResource.xwt
index 8f7b85d9ba4..d791136f23c 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNotificationResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleNotificationResource.xwt
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="NotificationResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:occurence"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:mechanism"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:waitServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:clearServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:signalServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:occurenceCountElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:maskElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:flushServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="NotificationResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:occurence"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:mechanism"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:waitServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:clearServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:signalServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:occurenceCountElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:maskElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:NotificationResource:flushServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleOperator.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleOperator.xwt
index 979f81f78a2..a00fd234335 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleOperator.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleOperator.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Operator">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:Operators:Operator:symbol"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Operator">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:Operators:Operator:symbol"></ppe:StringEditor>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaCommStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaCommStep.xwt
index ba845083a5b..f8e9d80a88a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaCommStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaCommStep.xwt
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="PaCommStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:noSync"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="PaCommStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:noSync"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaLogicalResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaLogicalResource.xwt
index be2f8cfe78a..393c9313191 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaLogicalResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaLogicalResource.xwt
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="PaLogicalResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaLogicalResource:throughput"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaLogicalResource:poolSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaLogicalResource:utilization"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="PaLogicalResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaLogicalResource:throughput"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaLogicalResource:poolSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaLogicalResource:utilization"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRequestedStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRequestedStep.xwt
index dff1e13c999..70a951263ed 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRequestedStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRequestedStep.xwt
@@ -1,110 +1,110 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	text="PaRequestedStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:noSync"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	text="PaRequestedStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:noSync"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaResPassStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaResPassStep.xwt
index c59a0e7de07..e2ad267bfc8 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaResPassStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaResPassStep.xwt
@@ -1,103 +1,103 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="PaResPassStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaResPassStep:resUnits"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaResPassStep:resource"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="PaResPassStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaResPassStep:resUnits"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaResPassStep:resource"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRunTInstance.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRunTInstance.xwt
index 96a5b1c8150..bafdf100193 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRunTInstance.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaRunTInstance.xwt
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="PaRunTInstance">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:poolSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:throughput"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:utilization"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:unbddPool"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:instance"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:host"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="PaRunTInstance">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:poolSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:throughput"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:utilization"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:unbddPool"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:instance"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaRunTInstance:host"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaStep.xwt
index 1d89387240c..40f37a76b12 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePaStep.xwt
@@ -1,109 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	text="PaStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:noSync"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpCount"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavDemand"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	text="PaStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:blockT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:isAtomic"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:priority"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:selfDelay"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:rep"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:prob"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:noSync"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:concurRes"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:scenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:childScenario"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:root"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:cause"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:extOpCount"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:respT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:interOccT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemand"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:utilizationOnHost"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:hostDemandOps"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:throughput"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaStep:servDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:PAM:PaStep:behavDemand"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:timing"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:steps"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaScenario:parentStep"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePpUnit.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePpUnit.xwt
index aac94707aa4..bc2f516cec1 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePpUnit.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SinglePpUnit.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="PpUnit">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:PpUnit:memorySize"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:PpUnit:concPolicy"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="PpUnit">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:PpUnit:memorySize"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:PpUnit:concPolicy"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleProcessingResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleProcessingResource.xwt
index 5de369c6063..21afd2bb498 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleProcessingResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleProcessingResource.xwt
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="ProcessingResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="ProcessingResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRelease.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRelease.xwt
index 82b849e31a4..80cd1a74a3a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRelease.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRelease.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Release">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:GrService:owner"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Release">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:GrService:owner"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleReshape.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleReshape.xwt
index b57b775399d..448e7949812 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleReshape.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleReshape.xwt
@@ -1,18 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Reshape">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Reshape:repetitonShape"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Reshape:patternShape"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Reshape">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Reshape:repetitonShape"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Reshape:patternShape"></ppe:StringEditor>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleResource.xwt
index a9b5b4fbcb0..f7bf7b8b747 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleResource.xwt
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Resource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Resource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleResourceUsage.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleResourceUsage.xwt
index ac184b09670..613b29c33e9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleResourceUsage.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleResourceUsage.xwt
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="ResourceUsage">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="ResourceUsage">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:allocatedMemory"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:msgSize"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:execTime"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:energy"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:powerPeak"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedMemory"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:subUsage"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ResourceUsage:usedResources"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtAction.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtAction.xwt
index 0324b1af271..1b901824805 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtAction.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtAction.xwt
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	text="RtAction">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtAction:msgSize"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtAction:isAtomic"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtAction:synchKind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	text="RtAction">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtAction:msgSize"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtAction:isAtomic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtAction:synchKind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtFeature.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtFeature.xwt
index 47000ba2fd7..55d692e0835 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtFeature.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtFeature.xwt
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	text="RtFeature">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	text="RtFeature">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtService.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtService.xwt
index 381e8e4d375..a7b8dc1769e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtService.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtService.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="RtService">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtService:isAtomic"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtService:concPolicy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtService:exeKind"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtService:synchKind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="RtService">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtService:isAtomic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtService:concPolicy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtService:exeKind"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtService:synchKind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtSpecification.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtSpecification.xwt
index 76fc342e313..8c45f7994b7 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtSpecification.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtSpecification.xwt
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="RtSpecification">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:miss"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:boundDl"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:relDl"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:rdTime"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:utility"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:priority"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:absDl"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:occKind"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:tRef"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="RtSpecification">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:miss"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:boundDl"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:relDl"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:rdTime"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:utility"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:priority"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:absDl"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:occKind"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtSpecification:tRef"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtUnit.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtUnit.xwt
index 02eacd0f075..209f9687e7f 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtUnit.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleRtUnit.xwt
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="RtUnit">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:srPoolWaitingTime"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:msgMaxSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:memorySize"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:isMain"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:isDynamic"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:srPoolSize"></ppe:IntegerEditor>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:queueSize"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:queueSchedPolicy"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:srPoolPolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:main"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:operationalMode"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="RtUnit">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:srPoolWaitingTime"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:msgMaxSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:memorySize"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:isMain"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:isDynamic"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:srPoolSize"></ppe:IntegerEditor>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:queueSize"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:queueSchedPolicy"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:srPoolPolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:main"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:HLAM:RtUnit:operationalMode"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaAnalysisContext.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaAnalysisContext.xwt
index 63d62dbb786..14183317a63 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaAnalysisContext.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaAnalysisContext.xwt
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="SaAnalysisContext">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaAnalysisContext:isSched"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaAnalysisContext:optCriterion"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:context"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:CoreElements:Configuration:mode"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:workload"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:platform"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="SaAnalysisContext">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaAnalysisContext:isSched"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaAnalysisContext:optCriterion"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:context"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:CoreElements:Configuration:mode"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:workload"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaAnalysisContext:platform"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommHost.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommHost.xwt
index 4db10489a12..187bf5f00fa 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommHost.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommHost.xwt
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="SaCommHost">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaCommHost:schSlack"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaCommHost:isSched"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommHost:utilization"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommHost:throughput"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="SaCommHost">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaCommHost:schSlack"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaCommHost:isSched"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommHost:utilization"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaCommHost:throughput"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommStep.xwt
index 8bdf5838965..004a582da93 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaCommStep.xwt
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:x="http://www.eclipse.org/xwt" text="SaCommStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaCommStep:deadline"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaCommStep:schSlack"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaCommStep:spareCap"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:x="http://www.eclipse.org/xwt" text="SaCommStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaCommStep:deadline"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaCommStep:schSlack"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaCommStep:spareCap"></ppe:StringEditor>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaEndtoEndFlow.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaEndtoEndFlow.xwt
index d591ec25174..e4c5e976152 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaEndtoEndFlow.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaEndtoEndFlow.xwt
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="SaEndtoEndFlow">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaEndtoEndFlow:isSched"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaEndtoEndFlow:schSlack"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaEndtoEndFlow:end2EndT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaEndtoEndFlow:end2EndD"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaEndtoEndFlow:timing"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="SaEndtoEndFlow">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaEndtoEndFlow:isSched"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaEndtoEndFlow:schSlack"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaEndtoEndFlow:end2EndT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaEndtoEndFlow:end2EndD"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaEndtoEndFlow:timing"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaExecHost.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaExecHost.xwt
index d35614e6ec5..83e3f268767 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaExecHost.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaExecHost.xwt
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="SaExecHost">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaExecHost:schedUtiliz"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaExecHost:schSlack"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaExecHost:ISRswitchT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaExecHost:ISRprioRange"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaExecHost:isSched"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:schedPriRange"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:cntxtSwT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:clockOvh"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:commRcvOvh"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:commTxOvh"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:memSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:throughput"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:utilization"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="SaExecHost">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaExecHost:schedUtiliz"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaExecHost:schSlack"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaExecHost:ISRswitchT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaExecHost:ISRprioRange"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaExecHost:isSched"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:speedFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:schedPriRange"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:cntxtSwT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:clockOvh"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:commRcvOvh"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:commTxOvh"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:memSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:ProcessingResource:mainScheduler"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:throughput"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaExecHost:utilization"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSchedObs.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSchedObs.xwt
index 40137810e69..5fa5494418d 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSchedObs.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSchedObs.xwt
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="SaSchedObs">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaSchedObs:blockT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaSchedObs:suspentions"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaSchedObs:overlaps"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:startObs"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:endObs"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="SaSchedObs">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:laxity"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaSchedObs:blockT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaSchedObs:suspentions"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaSchedObs:overlaps"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:startObs"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:GQAM:GaTimedObs:endObs"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSharedResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSharedResource.xwt
index 716b572bbd9..1f3eb0fafd4 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSharedResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaSharedResource.xwt
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="SaSharedResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:ceiling"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:otherProtectProtocol"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaSharedResource:isConsum"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaSharedResource:capacity"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaSharedResource:isPreemp"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:scheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaSharedResource:releaseT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaSharedResource:acquisT"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="SaSharedResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:ceiling"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:otherProtectProtocol"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaSharedResource:isConsum"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaSharedResource:capacity"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaSharedResource:isPreemp"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:scheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaSharedResource:releaseT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaSharedResource:acquisT"></ppe:MultiString>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaStep.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaStep.xwt
index 28aaab1363d..0a9ce0188ab 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaStep.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSaStep.xwt
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	text="SaStep">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:spareCap"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:numberSelfSuspensions"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:preemptT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:nonpreemptionBlocking"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:deadline"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:schSlack"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:readyT"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:selfSuspensionBlocking"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:sharedRes"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	text="SaStep">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:spareCap"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:numberSelfSuspensions"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:preemptT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:nonpreemptionBlocking"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:deadline"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:schSlack"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:readyT"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:selfSuspensionBlocking"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_AnalysisModel:SAM:SaStep:sharedRes"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSchedulableResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSchedulableResource.xwt
index 12eb413efbf..8d1b1a6b01c 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSchedulableResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSchedulableResource.xwt
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="SchedulableResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:dependentScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:schedParams"></ppe:MultiString>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="SchedulableResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:dependentScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:schedParams"></ppe:MultiString>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleScheduler.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleScheduler.xwt
index fb1609f2008..4334ec08779 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleScheduler.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleScheduler.xwt
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets"

-	text="Scheduler">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets"
+	text="Scheduler">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSecondaryScheduler.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSecondaryScheduler.xwt
index 0ab771411ef..873c8276ed9 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSecondaryScheduler.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSecondaryScheduler.xwt
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:x="http://www.eclipse.org/xwt" text="SecondaryScheduler">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:SecondaryScheduler:virtualProcessingUnits"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:x="http://www.eclipse.org/xwt" text="SecondaryScheduler">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedule"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:otherSchedPolicy"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:isPreemptible"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedPolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:host"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:SecondaryScheduler:virtualProcessingUnits"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:processingUnits"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:protectedSharedResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Scheduler:schedulableResources"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleShaped.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleShaped.xwt
index eebdcb6f0de..cf81935040e 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleShaped.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleShaped.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="Shaped">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Shaped:shape"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="Shaped">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Shaped:shape"></ppe:StringEditor>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSharedDataComResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSharedDataComResource.xwt
index 4e1dafa4ee2..604f507f560 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSharedDataComResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSharedDataComResource.xwt
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="SharedDataComResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SharedDataComResource:readServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SharedDataComResource:writeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="SharedDataComResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SharedDataComResource:readServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SharedDataComResource:writeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleStorageResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleStorageResource.xwt
index 358fac70ae0..8301cf18734 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleStorageResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleStorageResource.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" text="StorageResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" text="StorageResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:StorageResource:elementSize"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwAccessService.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwAccessService.xwt
index eb35f207b49..cb08fb0afe2 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwAccessService.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwAccessService.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="SwAccessService">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwAccessService:isModifier"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwAccessService:accessedElement"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:GrService:owner"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="SwAccessService">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwAccessService:isModifier"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwAccessService:accessedElement"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:GrService:owner"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwCommunicationResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwCommunicationResource.xwt
index 370564ff8f3..8965f0f2eec 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwCommunicationResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwCommunicationResource.xwt
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="SwCommunicationResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="SwCommunicationResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:elementSize"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:transmMode"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:blockT"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:capacity"></ppe:MultiString>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:CommunicationMedia:packetT"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwConcurrentResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwConcurrentResource.xwt
index 27e2117a3da..443b67bef35 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwConcurrentResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwConcurrentResource.xwt
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns="http://www.eclipse.org/xwt/presentation" text="SwConcurrentResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:type"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:periodElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:entryPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:terminateServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:heapSizeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:shareDataResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activateServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:priorityElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:stackSizeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:notificationResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:resumeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:disableConcurrencyServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:messageResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:enableConcurrencyServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:mutualExclusionResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:suspendServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:adressSpace"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns="http://www.eclipse.org/xwt/presentation" text="SwConcurrentResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:type"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:periodElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:entryPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:terminateServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:heapSizeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:shareDataResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activateServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:priorityElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:stackSizeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:notificationResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:resumeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:disableConcurrencyServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:messageResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:enableConcurrencyServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:mutualExclusionResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:suspendServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:adressSpace"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwInteractionResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwInteractionResource.xwt
index 35666744d34..f379177ac5d 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwInteractionResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwInteractionResource.xwt
@@ -1,65 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="SwInteractionResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="SwInteractionResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwMutualExclusionResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwMutualExclusionResource.xwt
index 7a2c4400268..e43d63239a0 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwMutualExclusionResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwMutualExclusionResource.xwt
@@ -1,83 +1,83 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" text="SwMutualExclusionResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:ceiling"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:otherProtectProtocol"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:concurrentAccessProtocol"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:mechanism"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:scheduler"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:acquireServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:accessTokenElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:releaseServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" text="SwMutualExclusionResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:ceiling"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:otherProtectProtocol"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:protectKind"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:concurrentAccessProtocol"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:mechanism"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:MutualExclusionResource:scheduler"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:acquireServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:accessTokenElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwMutualExclusionResource:releaseServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwResource.xwt
index 7919f1f495b..f9d5ce3d033 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwResource.xwt
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="SwResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="SwResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSchedulableResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSchedulableResource.xwt
index 979edae43c6..1652cd21aa0 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSchedulableResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSchedulableResource.xwt
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="SwSchedulableResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:type"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:isStaticSchedulingFeature"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:isPreemptable"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:schedulers"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:host"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:dependentScheduler"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiString input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:schedParams"></ppe:MultiString>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:deadlineTypeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:delayServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:joinServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:yieldServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:deadlineElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:timeSliceElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:periodElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:entryPoints"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:terminateServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:heapSizeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:shareDataResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activateServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:priorityElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:stackSizeElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:notificationResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:resumeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:disableConcurrencyServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:messageResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:enableConcurrencyServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:mutualExclusionResources"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:suspendServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:adressSpace"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="SwSchedulableResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:type"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:isStaticSchedulingFeature"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:isPreemptable"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activationCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:schedulers"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:host"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:dependentScheduler"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiString input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:SchedulableResource:schedParams"></ppe:MultiString>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:deadlineTypeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:delayServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:joinServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:yieldServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:deadlineElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwSchedulableResource:timeSliceElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:periodElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:entryPoints"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:terminateServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:heapSizeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:shareDataResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:activateServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:priorityElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:stackSizeElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:notificationResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:resumeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:disableConcurrencyServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:messageResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:enableConcurrencyServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:mutualExclusionResources"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:suspendServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwConcurrentResource:adressSpace"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSynchronizationResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSynchronizationResource.xwt
index 24e15479b63..934ce0cf33f 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSynchronizationResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwSynchronizationResource.xwt
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="SwSynchronizationResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="SwSynchronizationResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:isIntraMemoryPartitionInteraction"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueueCapacity"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingQueuePolicy"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:memorySizeFootprint"></ppe:ReferenceDialog>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:initializeServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:deleteServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:identifierElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:createServices"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_ResourceCore:SwResource:stateElements"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Interaction:SwInteractionResource:waitingPolicyElements"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwTimerResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwTimerResource.xwt
index 4385116714e..9620db970e1 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwTimerResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSwTimerResource.xwt
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="SwTimerResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:TimerResource:duration"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:TimerResource:isPeriodic"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwTimerResource:durationElements"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="SwTimerResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:TimerResource:duration"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:TimerResource:isPeriodic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_DesignModel:SRM:SW_Concurrency:SwTimerResource:durationElements"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSynchronizationResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSynchronizationResource.xwt
index 54385684361..51a37ee33cd 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSynchronizationResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleSynchronizationResource.xwt
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="SynchronizationResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:j="clr-namespace:java.lang" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="SynchronizationResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTiler.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTiler.xwt
index a91b9420e90..94d5a75fb1a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTiler.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTiler.xwt
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="Tiler">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Tiler:paving"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Tiler:tiler"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Tiler:origin"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Annexes:RSM:Tiler:fitting"></ppe:StringEditor>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="Tiler">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Tiler:paving"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Tiler:tiler"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Tiler:origin"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Annexes:RSM:Tiler:fitting"></ppe:StringEditor>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedConstraint.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedConstraint.xwt
index 66cf5cc300c..5c05afe628d 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedConstraint.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedConstraint.xwt
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="TimedConstraint">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedConstraint:interpretation"></ppe:EnumCombo>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedElement:on"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="TimedConstraint">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedConstraint:interpretation"></ppe:EnumCombo>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:kind"></ppe:EnumCombo>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:NfpConstraint:mode"></ppe:MultiReference>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedElement:on"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDomain.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDomain.xwt
index db7c0dfdc41..43a0fc0a389 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDomain.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDomain.xwt
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="TimedDomain">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="TimedDomain">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDurationObservation.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDurationObservation.xwt
index 2e633aef1e0..6ff2eac8b76 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDurationObservation.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedDurationObservation.xwt
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group 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.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="TimedDurationObservation">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:InvalidWidget input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedDurationObservation:obsKind"></ppe:InvalidWidget>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group 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.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="TimedDurationObservation">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:InvalidWidget input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedDurationObservation:obsKind"></ppe:InvalidWidget>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedElement.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedElement.xwt
index c78631405e1..857ce2c281a 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedElement.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedElement.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="TimedElement">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedElement:on"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="TimedElement">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedElement:on"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedEvent.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedEvent.xwt
index 4e736baaf98..03b0af36f46 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedEvent.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedEvent.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"

-	text="TimedEvent">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:IntegerEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedEvent:repetition"></ppe:IntegerEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedEvent:every"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" xmlns:x="http://www.eclipse.org/xwt"
+	text="TimedEvent">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:IntegerEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedEvent:repetition"></ppe:IntegerEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedEvent:every"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedInstantObservation.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedInstantObservation.xwt
index 83305484f9a..bf86da993aa 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedInstantObservation.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedInstantObservation.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	text="TimedInstantObservation">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedInstantObservation:obsKind"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation" xmlns:x="http://www.eclipse.org/xwt"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	text="TimedInstantObservation">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedInstantObservation:obsKind"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedProcessing.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedProcessing.xwt
index bccb6cbbb53..f0dfa96c974 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedProcessing.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedProcessing.xwt
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:j="clr-namespace:java.lang" text="TimedProcessing">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:j="clr-namespace:java.lang" text="TimedProcessing">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:start"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:finish"></ppe:ReferenceDialog>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedProcessing:duration"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedValueSpecification.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedValueSpecification.xwt
index 73972274961..aa56595544d 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedValueSpecification.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimedValueSpecification.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.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.views.properties.widgets.layout"

-	text="TimedValueSpecification">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Foundations:Time:TimedValueSpecification:interpretation"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.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.infra.properties.ui.widgets.layout"
+	text="TimedValueSpecification">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Foundations:Time:TimedValueSpecification:interpretation"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimerResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimerResource.xwt
index dfe1874f3ee..e2c40af7576 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimerResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimerResource.xwt
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" text="TimerResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:TimerResource:duration"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:TimerResource:isPeriodic"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns="http://www.eclipse.org/xwt/presentation" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" text="TimerResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:TimerResource:duration"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:TimerResource:isPeriodic"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimingResource.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimingResource.xwt
index 72935a42457..956c18be602 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimingResource.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTimingResource.xwt
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	text="TimingResource">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>

-		<ppe:BooleanRadio input="{Binding}"

-			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	text="TimingResource">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:resMult"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isProtected"></ppe:BooleanRadio>
+		<ppe:BooleanRadio input="{Binding}"
+			property="MARTE:MARTE_Foundations:GRM:Resource:isActive"></ppe:BooleanRadio>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTupleType.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTupleType.xwt
index 675af0b9a7f..71a18551d4b 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTupleType.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleTupleType.xwt
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:j="clr-namespace:java.lang" text="TupleType">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:MultiReference input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:DataTypes:TupleType:tupleAttrib"></ppe:MultiReference>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:j="clr-namespace:java.lang" text="TupleType">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:MultiReference input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:DataTypes:TupleType:tupleAttrib"></ppe:MultiReference>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleUnit.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleUnit.xwt
index ff5d282d6f0..7aaf3311002 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleUnit.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleUnit.xwt
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets" text="Unit">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:Unit:convFactor"></ppe:StringEditor>

-		<ppe:StringEditor input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:Unit:convOffset"></ppe:StringEditor>

-	</Composite>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:ReferenceDialog input="{Binding}"

-			property="MARTE:MARTE_Foundations:NFPs:Unit:baseUnit"></ppe:ReferenceDialog>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets" text="Unit">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:Unit:convFactor"></ppe:StringEditor>
+		<ppe:StringEditor input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:Unit:convOffset"></ppe:StringEditor>
+	</Composite>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:ReferenceDialog input="{Binding}"
+			property="MARTE:MARTE_Foundations:NFPs:Unit:baseUnit"></ppe:ReferenceDialog>
+	</Composite>
 </Group>
\ No newline at end of file
diff --git a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleVar.xwt b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleVar.xwt
index 73e78e493ca..d60070032e7 100644
--- a/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleVar.xwt
+++ b/extraplugins/marte/properties/org.eclipse.papyrus.marte.properties/model/ui/SingleVar.xwt
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<Group xmlns="http://www.eclipse.org/xwt/presentation"

-	xmlns:ppe="clr-namespace:org.eclipse.papyrus.views.properties.widgets"

-	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"

-	xmlns:ppel="clr-namespace:org.eclipse.papyrus.views.properties.widgets.layout"

-	text="Var">

-	<Group.layout>

-		<ppel:PropertiesLayout></ppel:PropertiesLayout>

-	</Group.layout>

-	<Composite>

-		<Composite.layout>

-			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>

-		</Composite.layout>

-		<ppe:EnumCombo input="{Binding}"

-			property="MARTE:MARTE_Annexes:VSL:Variables:Var:dir"></ppe:EnumCombo>

-	</Composite>

+<?xml version="1.0" encoding="UTF-8"?>
+<Group xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets"
+	xmlns:x="http://www.eclipse.org/xwt" xmlns:j="clr-namespace:java.lang"
+	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	text="Var">
+	<Group.layout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+	</Group.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:EnumCombo input="{Binding}"
+			property="MARTE:MARTE_Annexes:VSL:Variables:Var:dir"></ppe:EnumCombo>
+	</Composite>
 </Group>
\ No newline at end of file