Merge branch 'master' into bugs/462954-alf-M7

Change-Id: I4913dca8830385908fc04c5cbc66fc47d55e1b52
Signed-off-by: jeremie.tatibouet <jeremie.tatibouet@cea.fr>

14 files changed, 288 insertions, 281 deletions

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/ui/MultipleRTMessageSet.xwt b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/ui/MultipleRTMessageSet.xwt
index f61526ae74b..91978555710 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/ui/MultipleRTMessageSet.xwt
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/ui/MultipleRTMessageSet.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite 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">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}"
-			property="UMLRealTime:RTMessageSet:rtMsgKind"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference property="UML:Interface:ownedOperation"
-			input="{Binding}"></ppe:MultiReference>
-	</Composite>
+<?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

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

+			property="UMLRealTime:RTMessageSet:rtMsgKind" customLabel="Protocol Message Kind"></ppe:EnumCombo>

+	</Composite>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:MultiReference input="{Binding}"

+			property="UML:Interface:ownedOperation" customLabel="Protocol Messages"></ppe:MultiReference>

+	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/ui/SingleRTMessageSet.xwt b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/ui/SingleRTMessageSet.xwt
index f61526ae74b..1c9fc8184a9 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/ui/SingleRTMessageSet.xwt
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/ui/SingleRTMessageSet.xwt
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Composite 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">
-	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
-	</Composite.layout>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:EnumCombo input="{Binding}"
-			property="UMLRealTime:RTMessageSet:rtMsgKind"></ppe:EnumCombo>
-	</Composite>
-	<Composite>
-		<Composite.layout>
-			<ppel:PropertiesLayout></ppel:PropertiesLayout>
-		</Composite.layout>
-		<ppe:MultiReference property="UML:Interface:ownedOperation"
-			input="{Binding}"></ppe:MultiReference>
-	</Composite>
+<?xml version="1.0" encoding="UTF-8"?>

+<Composite 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">

+	<Composite.layout>

+		<ppel:PropertiesLayout></ppel:PropertiesLayout>

+	</Composite.layout>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout numColumns="1"></ppel:PropertiesLayout>

+		</Composite.layout>

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

+			property="UMLRealTime:RTMessageSet:rtMsgKind" customLabel="Protocol Message Kind"></ppe:EnumCombo>

+	</Composite>

+	<Composite>

+		<Composite.layout>

+			<ppel:PropertiesLayout></ppel:PropertiesLayout>

+		</Composite.layout>

+		<ppe:MultiReference input="{Binding}"

+			property="UML:Interface:ownedOperation" customLabel="Protocol Messages"></ppe:MultiReference>

+	</Composite>

 </Composite>
\ No newline at end of file
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/uml-rt.ctx b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/uml-rt.ctx
index 1a2b9144159..29d4aba6cc4 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/uml-rt.ctx
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/uml-rt.ctx
@@ -1,189 +1,189 @@
-<?xml version="1.0" encoding="ASCII"?>
-<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" name="UMLRealTime">
-  <dependencies href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#/"/>
-  <tabs label="UMLRealTime" id="umlrealtime" priority="100">
-    <sections name="Single RTConnector" sectionFile="ui/SingleRTConnector.xwt">
-      <widget href="ui/SingleRTConnector.xwt#/"/>
-    </sections>
-    <sections name="Multiple RTConnector" sectionFile="ui/MultipleRTConnector.xwt">
-      <widget href="ui/MultipleRTConnector.xwt#/"/>
-    </sections>
-    <sections name="Single RTPort" sectionFile="ui/SingleRTPort.xwt">
-      <widget href="ui/SingleRTPort.xwt#/"/>
-    </sections>
-    <sections name="Multiple RTPort" sectionFile="ui/MultipleRTPort.xwt">
-      <widget href="ui/MultipleRTPort.xwt#/"/>
-    </sections>
-    <sections name="Single Capsule" sectionFile="ui/SingleCapsule.xwt">
-      <widget href="ui/SingleCapsule.xwt#/"/>
-    </sections>
-    <sections name="Multiple Capsule" sectionFile="ui/MultipleCapsule.xwt">
-      <widget href="ui/MultipleCapsule.xwt#/"/>
-    </sections>
-    <sections name="Single Protocol" sectionFile="ui/SingleProtocol.xwt">
-      <widget href="ui/SingleProtocol.xwt#/"/>
-    </sections>
-    <sections name="Multiple Protocol" sectionFile="ui/MultipleProtocol.xwt">
-      <widget href="ui/MultipleProtocol.xwt#/"/>
-    </sections>
-    <sections name="Single RTMessageSet" sectionFile="ui/SingleRTMessageSet.xwt">
-      <widget href="ui/SingleRTMessageSet.xwt#/"/>
-    </sections>
-    <sections name="Multiple RTMessageSet" sectionFile="ui/MultipleRTMessageSet.xwt">
-      <widget href="ui/MultipleRTMessageSet.xwt#/"/>
-    </sections>
-    <sections name="Single ProtocolContainer" sectionFile="ui/SingleProtocolContainer.xwt">
-      <widget href="ui/SingleProtocolContainer.xwt#/"/>
-    </sections>
-    <sections name="Multiple ProtocolContainer" sectionFile="ui/MultipleProtocolContainer.xwt">
-      <widget href="ui/MultipleProtocolContainer.xwt#/"/>
-    </sections>
-    <sections name="Single CapsulePart" sectionFile="ui/SingleCapsulePart.xwt">
-      <widget href="ui/SingleCapsulePart.xwt#/"/>
-    </sections>
-    <sections name="Multiple CapsulePart" sectionFile="ui/MultipleCapsulePart.xwt">
-      <widget href="ui/MultipleCapsulePart.xwt#/"/>
-    </sections>
-    <sections name="Single RTRExcludedElement" sectionFile="ui/SingleRTRExcludedElement.xwt">
-      <widget href="ui/SingleRTRExcludedElement.xwt#/"/>
-    </sections>
-    <sections name="Multiple RTRExcludedElement" sectionFile="ui/MultipleRTRExcludedElement.xwt">
-      <widget href="ui/MultipleRTRExcludedElement.xwt#/"/>
-    </sections>
-  </tabs>
-  <views name="Single RTConnector" sections="//@tabs.0/@sections.0" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleRTConnector">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::RTConnector"/>
-    </constraints>
-  </views>
-  <views elementMultiplicity="-1" name="Multiple RTConnector" sections="//@tabs.0/@sections.1" automaticContext="true" datacontexts="//@dataContexts.0/@elements.1">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleRTConnector">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::RTConnector"/>
-    </constraints>
-  </views>
-  <views name="Single RTPort" sections="//@tabs.0/@sections.2" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleRTPort">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::RTPort"/>
-    </constraints>
-  </views>
-  <views elementMultiplicity="-1" name="Multiple RTPort" sections="//@tabs.0/@sections.3" automaticContext="true" datacontexts="//@dataContexts.0/@elements.0">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleRTPort">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::RTPort"/>
-    </constraints>
-  </views>
-  <views name="Single Capsule" sections="//@tabs.0/@sections.4" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleCapsule">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::Capsule"/>
-    </constraints>
-  </views>
-  <views elementMultiplicity="-1" name="Multiple Capsule" sections="//@tabs.0/@sections.5" automaticContext="true" datacontexts="//@dataContexts.0/@elements.5">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleCapsule">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::Capsule"/>
-    </constraints>
-  </views>
-  <views name="Single Protocol" sections="//@tabs.0/@sections.6" automaticContext="true" datacontexts="//@dataContexts.1/@elements.0">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleProtocol">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::Protocol"/>
-    </constraints>
-  </views>
-  <views elementMultiplicity="-1" name="Multiple Protocol" sections="//@tabs.0/@sections.7" automaticContext="true" datacontexts="//@dataContexts.1/@elements.0">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleProtocol">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::Protocol"/>
-    </constraints>
-  </views>
-  <views name="Single RTMessageSet" sections="//@tabs.0/@sections.8" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleRTMessageSet">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::RTMessageSet"/>
-    </constraints>
-  </views>
-  <views elementMultiplicity="-1" name="Multiple RTMessageSet" sections="//@tabs.0/@sections.9" automaticContext="true" datacontexts="//@dataContexts.0/@elements.6">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleRTMessageSet">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::RTMessageSet"/>
-    </constraints>
-  </views>
-  <views name="Single ProtocolContainer" sections="//@tabs.0/@sections.10" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleProtocolContainer">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::ProtocolContainer"/>
-    </constraints>
-  </views>
-  <views elementMultiplicity="-1" name="Multiple ProtocolContainer" sections="//@tabs.0/@sections.11" automaticContext="true" datacontexts="//@dataContexts.0/@elements.3">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleProtocolContainer">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::ProtocolContainer"/>
-    </constraints>
-  </views>
-  <views name="Single CapsulePart" sections="//@tabs.0/@sections.12" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleCapsulePart">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::CapsulePart"/>
-    </constraints>
-  </views>
-  <views elementMultiplicity="-1" name="Multiple CapsulePart" sections="//@tabs.0/@sections.13" automaticContext="true" datacontexts="//@dataContexts.0/@elements.2">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleCapsulePart">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::CapsulePart"/>
-    </constraints>
-  </views>
-  <views name="Single RTRExcludedElement" sections="//@tabs.0/@sections.14" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isSingleRTRExcludedElement">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::RTRExcludedElement"/>
-    </constraints>
-  </views>
-  <views elementMultiplicity="-1" name="Multiple RTRExcludedElement" sections="//@tabs.0/@sections.15" automaticContext="true" datacontexts="//@dataContexts.0/@elements.4">
-    <constraints xsi:type="constraints:SimpleConstraint" name="isMultipleRTRExcludedElement">
-      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>
-      <properties xsi:type="constraints:ValueProperty" name="stereotypeName" value="UMLRealTime::RTRExcludedElement"/>
-    </constraints>
-  </views>
-  <dataContexts name="UMLRealTime">
-    <elements name="RTPort">
-      <properties name="isNotification" type="Boolean"/>
-      <properties name="isPublish" type="Boolean"/>
-      <properties name="isWired" type="Boolean"/>
-      <properties name="registration" type="Enumeration"/>
-      <properties name="registrationOverride"/>
-      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.58"/>
-    </elements>
-    <elements name="RTConnector">
-      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.65"/>
-    </elements>
-    <elements name="CapsulePart">
-      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.35"/>
-    </elements>
-    <elements name="ProtocolContainer">
-      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.2"/>
-    </elements>
-    <elements name="RTRExcludedElement">
-      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.17"/>
-    </elements>
-    <elements name="Capsule">
-      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.45"/>
-    </elements>
-    <elements name="RTMessageSet">
-      <properties name="rtMsgKind" type="Enumeration"/>
-      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.48"/>
-    </elements>
-    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.2"/>
-  </dataContexts>
-  <dataContexts name="UMLRealTimeExt">
-    <elements name="Protocol">
-      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.78"/>
-      <properties name="provides" type="Reference"/>
-      <properties name="required" type="Reference"/>
-      <properties name="provreq" type="Reference"/>
-    </elements>
-      <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/Environment.xmi#//@modelElementFactories.0"/>
-  </dataContexts>
-</contexts:Context>
+<?xml version="1.0" encoding="ASCII"?>

+<contexts:Context xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:constraints="http://www.eclipse.org/papyrus/constraints/0.9" xmlns:contexts="http://www.eclipse.org/papyrus/properties/contexts/0.9" xmi:id="_WdNAMPMfEeSMV8TyMaa7Sg" name="UMLRealTime">

+  <dependencies href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#_69QJkKDJEeSZxfCXzZz3-w"/>

+  <tabs xmi:id="_WdNAMfMfEeSMV8TyMaa7Sg" label="UMLRealTime" id="umlrealtime" priority="100">

+    <sections xmi:id="_WdNAMvMfEeSMV8TyMaa7Sg" name="Single RTConnector" sectionFile="ui/SingleRTConnector.xwt">

+      <widget href="ui/SingleRTConnector.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAM_MfEeSMV8TyMaa7Sg" name="Multiple RTConnector" sectionFile="ui/MultipleRTConnector.xwt">

+      <widget href="ui/MultipleRTConnector.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNANPMfEeSMV8TyMaa7Sg" name="Single RTPort" sectionFile="ui/SingleRTPort.xwt">

+      <widget href="ui/SingleRTPort.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNANfMfEeSMV8TyMaa7Sg" name="Multiple RTPort" sectionFile="ui/MultipleRTPort.xwt">

+      <widget href="ui/MultipleRTPort.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNANvMfEeSMV8TyMaa7Sg" name="Single Capsule" sectionFile="ui/SingleCapsule.xwt">

+      <widget href="ui/SingleCapsule.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAN_MfEeSMV8TyMaa7Sg" name="Multiple Capsule" sectionFile="ui/MultipleCapsule.xwt">

+      <widget href="ui/MultipleCapsule.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAOPMfEeSMV8TyMaa7Sg" name="Single Protocol" sectionFile="ui/SingleProtocol.xwt">

+      <widget href="ui/SingleProtocol.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAOfMfEeSMV8TyMaa7Sg" name="Multiple Protocol" sectionFile="ui/MultipleProtocol.xwt">

+      <widget href="ui/MultipleProtocol.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAOvMfEeSMV8TyMaa7Sg" name="Single RTMessageSet" sectionFile="ui/SingleRTMessageSet.xwt">

+      <widget href="ui/SingleRTMessageSet.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAO_MfEeSMV8TyMaa7Sg" name="Multiple RTMessageSet" sectionFile="ui/MultipleRTMessageSet.xwt">

+      <widget href="ui/MultipleRTMessageSet.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAPPMfEeSMV8TyMaa7Sg" name="Single ProtocolContainer" sectionFile="ui/SingleProtocolContainer.xwt">

+      <widget href="ui/SingleProtocolContainer.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAPfMfEeSMV8TyMaa7Sg" name="Multiple ProtocolContainer" sectionFile="ui/MultipleProtocolContainer.xwt">

+      <widget href="ui/MultipleProtocolContainer.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAPvMfEeSMV8TyMaa7Sg" name="Single CapsulePart" sectionFile="ui/SingleCapsulePart.xwt">

+      <widget href="ui/SingleCapsulePart.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAP_MfEeSMV8TyMaa7Sg" name="Multiple CapsulePart" sectionFile="ui/MultipleCapsulePart.xwt">

+      <widget href="ui/MultipleCapsulePart.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAQPMfEeSMV8TyMaa7Sg" name="Single RTRExcludedElement" sectionFile="ui/SingleRTRExcludedElement.xwt">

+      <widget href="ui/SingleRTRExcludedElement.xwt#/"/>

+    </sections>

+    <sections xmi:id="_WdNAQfMfEeSMV8TyMaa7Sg" name="Multiple RTRExcludedElement" sectionFile="ui/MultipleRTRExcludedElement.xwt">

+      <widget href="ui/MultipleRTRExcludedElement.xwt#/"/>

+    </sections>

+  </tabs>

+  <views xmi:id="_WdNAQvMfEeSMV8TyMaa7Sg" name="Single RTConnector" sections="_WdNAMvMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnafMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNAQ_MfEeSMV8TyMaa7Sg" name="isSingleRTConnector">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNARPMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::RTConnector"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNARfMfEeSMV8TyMaa7Sg" elementMultiplicity="-1" name="Multiple RTConnector" sections="_WdNAM_MfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnafMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNARvMfEeSMV8TyMaa7Sg" name="isMultipleRTConnector">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNAR_MfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::RTConnector"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNASPMfEeSMV8TyMaa7Sg" name="Single RTPort" sections="_WdNANPMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnY_MfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNASfMfEeSMV8TyMaa7Sg" name="isSingleRTPort">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNASvMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::RTPort"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNAS_MfEeSMV8TyMaa7Sg" elementMultiplicity="-1" name="Multiple RTPort" sections="_WdNANfMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnY_MfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNATPMfEeSMV8TyMaa7Sg" name="isMultipleRTPort">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNATfMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::RTPort"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNATvMfEeSMV8TyMaa7Sg" name="Single Capsule" sections="_WdNANvMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnbfMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNAT_MfEeSMV8TyMaa7Sg" name="isSingleCapsule">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnQPMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::Capsule"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnQfMfEeSMV8TyMaa7Sg" elementMultiplicity="-1" name="Multiple Capsule" sections="_WdNAN_MfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnbfMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnQvMfEeSMV8TyMaa7Sg" name="isMultipleCapsule">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnQ_MfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::Capsule"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnRPMfEeSMV8TyMaa7Sg" name="Single Protocol" sections="_WdNAOPMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNncfMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnRfMfEeSMV8TyMaa7Sg" name="isSingleProtocol">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnRvMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::Protocol"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnR_MfEeSMV8TyMaa7Sg" elementMultiplicity="-1" name="Multiple Protocol" sections="_WdNAOfMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNncfMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnSPMfEeSMV8TyMaa7Sg" name="isMultipleProtocol">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnSfMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::Protocol"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnSvMfEeSMV8TyMaa7Sg" name="Single RTMessageSet" sections="_WdNAOvMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnbvMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnS_MfEeSMV8TyMaa7Sg" name="isSingleRTMessageSet">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnTPMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::RTMessageSet"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnTfMfEeSMV8TyMaa7Sg" elementMultiplicity="-1" name="Multiple RTMessageSet" sections="_WdNAO_MfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnbvMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnTvMfEeSMV8TyMaa7Sg" name="isMultipleRTMessageSet">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnT_MfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::RTMessageSet"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnUPMfEeSMV8TyMaa7Sg" name="Single ProtocolContainer" sections="_WdNAPPMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNna_MfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnUfMfEeSMV8TyMaa7Sg" name="isSingleProtocolContainer">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnUvMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::ProtocolContainer"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnU_MfEeSMV8TyMaa7Sg" elementMultiplicity="-1" name="Multiple ProtocolContainer" sections="_WdNAPfMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNna_MfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnVPMfEeSMV8TyMaa7Sg" name="isMultipleProtocolContainer">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnVfMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::ProtocolContainer"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnVvMfEeSMV8TyMaa7Sg" name="Single CapsulePart" sections="_WdNAPvMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnavMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnV_MfEeSMV8TyMaa7Sg" name="isSingleCapsulePart">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnWPMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::CapsulePart"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnWfMfEeSMV8TyMaa7Sg" elementMultiplicity="-1" name="Multiple CapsulePart" sections="_WdNAP_MfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnavMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnWvMfEeSMV8TyMaa7Sg" name="isMultipleCapsulePart">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnW_MfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::CapsulePart"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnXPMfEeSMV8TyMaa7Sg" name="Single RTRExcludedElement" sections="_WdNAQPMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnbPMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnXfMfEeSMV8TyMaa7Sg" name="isSingleRTRExcludedElement">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnXvMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::RTRExcludedElement"/>

+    </constraints>

+  </views>

+  <views xmi:id="_WdNnX_MfEeSMV8TyMaa7Sg" elementMultiplicity="-1" name="Multiple RTRExcludedElement" sections="_WdNAQfMfEeSMV8TyMaa7Sg" automaticContext="true" datacontexts="_WdNnbPMfEeSMV8TyMaa7Sg">

+    <constraints xsi:type="constraints:SimpleConstraint" xmi:id="_WdNnYPMfEeSMV8TyMaa7Sg" name="isMultipleRTRExcludedElement">

+      <constraintType href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@constraintTypes.1"/>

+      <properties xsi:type="constraints:ValueProperty" xmi:id="_WdNnYfMfEeSMV8TyMaa7Sg" name="stereotypeName" value="UMLRealTime::RTRExcludedElement"/>

+    </constraints>

+  </views>

+  <dataContexts xmi:id="_WdNnYvMfEeSMV8TyMaa7Sg" name="UMLRealTime">

+    <elements xmi:id="_WdNnY_MfEeSMV8TyMaa7Sg" name="RTPort">

+      <properties xmi:id="_WdNnZPMfEeSMV8TyMaa7Sg" name="isNotification" type="Boolean"/>

+      <properties xmi:id="_WdNnZfMfEeSMV8TyMaa7Sg" name="isPublish" type="Boolean"/>

+      <properties xmi:id="_WdNnZvMfEeSMV8TyMaa7Sg" name="isWired" type="Boolean"/>

+      <properties xmi:id="_WdNnZ_MfEeSMV8TyMaa7Sg" name="registration" type="Enumeration"/>

+      <properties xmi:id="_WdNnaPMfEeSMV8TyMaa7Sg" name="registrationOverride"/>

+      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.58"/>

+    </elements>

+    <elements xmi:id="_WdNnafMfEeSMV8TyMaa7Sg" name="RTConnector">

+      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.65"/>

+    </elements>

+    <elements xmi:id="_WdNnavMfEeSMV8TyMaa7Sg" name="CapsulePart">

+      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.35"/>

+    </elements>

+    <elements xmi:id="_WdNna_MfEeSMV8TyMaa7Sg" name="ProtocolContainer">

+      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.2"/>

+    </elements>

+    <elements xmi:id="_WdNnbPMfEeSMV8TyMaa7Sg" name="RTRExcludedElement">

+      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.17"/>

+    </elements>

+    <elements xmi:id="_WdNnbfMfEeSMV8TyMaa7Sg" name="Capsule">

+      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.45"/>

+    </elements>

+    <elements xmi:id="_WdNnbvMfEeSMV8TyMaa7Sg" name="RTMessageSet">

+      <properties xmi:id="_WdNnb_MfEeSMV8TyMaa7Sg" name="rtMsgKind" type="Enumeration"/>

+      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.48"/>

+    </elements>

+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.uml.properties/Model/Environment.xmi#//@modelElementFactories.2"/>

+  </dataContexts>

+  <dataContexts xmi:id="_WdNncPMfEeSMV8TyMaa7Sg" name="UMLRealTimeExt">

+    <elements xmi:id="_WdNncfMfEeSMV8TyMaa7Sg" name="Protocol">

+      <properties xmi:id="_WdNncvMfEeSMV8TyMaa7Sg" name="provides" type="Reference"/>

+      <properties xmi:id="_WdNnc_MfEeSMV8TyMaa7Sg" name="required" type="Reference"/>

+      <properties xmi:id="_WdNndPMfEeSMV8TyMaa7Sg" name="provreq" type="Reference"/>

+      <supertypes href="ppe:/context/org.eclipse.papyrus.uml.properties/Model/UML/UML.ctx#//@dataContexts.0/@elements.78"/>

+    </elements>

+    <modelElementFactory href="ppe:/environment/org.eclipse.papyrus.umlrt.properties/propertyView/UML-RT/Environment.xmi#//@modelElementFactories.0"/>

+  </dataContexts>

+</contexts:Context>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/newchildmenu/newChildMenu.xmi b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/newchildmenu/newChildMenu.xmi
index a9ea68846e9..c5f370f3630 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/newchildmenu/newChildMenu.xmi
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/newchildmenu/newChildMenu.xmi
@@ -30,15 +30,15 @@
       label="RTMessageSet"
       elementTypeIdRef="org.eclipse.papyrus.umlrt.RTMessageSet"/>
   <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="RTMessage OUT"
+      label="ProtocolMessage OUT"
       icon="platform:/plugin/org.eclipse.papyrus.umlrt.ui/icons/rt_message_out.gif"
-      elementTypeIdRef="org.eclipse.papyrus.umlrt.RTMessageOut"/>
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.ProtocolMessageOut"/>
   <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="RTMessage INOUT"
+      label="ProtocolMessage INOUT"
       icon="platform:/plugin/org.eclipse.papyrus.umlrt.ui/icons/rt_message_inout.gif"
-      elementTypeIdRef="org.eclipse.papyrus.umlrt.RTMessageInOut"/>
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.ProtocolMessageInOut"/>
   <menu xsi:type="ElementCreationMenuModel:CreationMenu"
-      label="RTMessage IN"
+      label="ProtocolMessage IN"
       icon="platform:/plugin/org.eclipse.papyrus.umlrt.ui/icons/rt_message_in.gif"
-      elementTypeIdRef="org.eclipse.papyrus.umlrt.RTMessageIn"/>
+      elementTypeIdRef="org.eclipse.papyrus.umlrt.ProtocolMessageIn"/>
 </ElementCreationMenuModel:Folder>
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.paletteconfiguration b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.paletteconfiguration
index d040bfccc85..fc935dab643 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.paletteconfiguration
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/palettes/UML-RT.ProtocolDiagram.paletteconfiguration
@@ -23,7 +23,7 @@
       <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3037"/>

       <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.RTMessageSet_3038"/>

     </ownedConfigurations>

-    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.Operation" label="Operation" description="Create an Operation">

+    <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="palettemodel.org.eclipse.papyrus.umlrt.ProtocolMessage" label="ProtocolMessage" description="Create a Protocol Message">

       <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="icons/full/obj16/Operation.gif"/>

       <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Operation_3003"/>

       <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Operation_3007"/>

@@ -32,4 +32,5 @@
       <elementDescriptors elementTypeId="org.eclipse.papyrus.umlrt.Operation_3042"/>

     </ownedConfigurations>

   </drawerConfigurations>

+  <requiredProfiles>UMLRealTime</requiredProfiles>

 </paletteconfiguration:PaletteConfiguration>

diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/src/org/eclipse/papyrus/umlrt/ui/provider/UMLRTFilteredLabelProvider.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/src/org/eclipse/papyrus/umlrt/ui/provider/UMLRTFilteredLabelProvider.java
index fa3a70c2ccc..9bc09a0c993 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/src/org/eclipse/papyrus/umlrt/ui/provider/UMLRTFilteredLabelProvider.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/src/org/eclipse/papyrus/umlrt/ui/provider/UMLRTFilteredLabelProvider.java
@@ -68,9 +68,9 @@ public class UMLRTFilteredLabelProvider extends UMLRTLabelProvider implements IF
 		}
 
 		// specific for RT Message label
-		ISpecializationType inMessageType = (ISpecializationType) UMLRTElementTypesEnumerator.RT_MESSAGE_IN;
-		ISpecializationType outMessageType = (ISpecializationType) UMLRTElementTypesEnumerator.RT_MESSAGE_OUT;
-		ISpecializationType inOutMessageType = (ISpecializationType) UMLRTElementTypesEnumerator.RT_MESSAGE_INOUT;
+		ISpecializationType inMessageType = (ISpecializationType) UMLRTElementTypesEnumerator.PROTOCOL_MESSAGE_IN;
+		ISpecializationType outMessageType = (ISpecializationType) UMLRTElementTypesEnumerator.PROTOCOL_MESSAGE_OUT;
+		ISpecializationType inOutMessageType = (ISpecializationType) UMLRTElementTypesEnumerator.PROTOCOL_MESSAGE_INOUT;
 
 		if (inMessageType != null && inMessageType.getMatcher() != null && inMessageType.getMatcher().matches((EObject) semanticObject)) {
 			return "in " + super.getText(element);
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/src/org/eclipse/papyrus/umlrt/ui/provider/UMLRTLabelProvider.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/src/org/eclipse/papyrus/umlrt/ui/provider/UMLRTLabelProvider.java
index 0de3594cd45..94f43923406 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/src/org/eclipse/papyrus/umlrt/ui/provider/UMLRTLabelProvider.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt.ui/src/org/eclipse/papyrus/umlrt/ui/provider/UMLRTLabelProvider.java
@@ -59,10 +59,10 @@ public class UMLRTLabelProvider extends UMLFilteredLabelProvider {
 		typeIdtoIconPath.put(IUMLRTElementTypes.RT_EXCLUDED_ELEMENT_ID, ICON_PATH + "rt_excludedElement.gif");//$NON-NLS-1$
 		typeIdtoIconPath.put(IUMLRTElementTypes.RT_MESSAGE_SET_ID, ICON_PATH + "rt_messageset.png");//$NON-NLS-1$
 		typeIdtoIconPath.put(IUMLRTElementTypes.RT_PORT_ID, ICON_PATH + "rt_port.png");//$NON-NLS-1$
-		typeIdtoIconPath.put(IUMLRTElementTypes.RT_MESSAGE_IN_ID, RT_MESSAGE_IN_ICON);
-		typeIdtoIconPath.put(IUMLRTElementTypes.RT_MESSAGE_INOUT_ID, RT_MESSAGE_IN_OUT_ICON);
-		typeIdtoIconPath.put(IUMLRTElementTypes.RT_MESSAGE_OUT_ID, RT_MESSAGE_OUT_ICON);
-		typeIdtoIconPath.put(IUMLRTElementTypes.RT_MESSAGE_ID, RT_MESSAGE_UNDEFINED_ICON);
+		typeIdtoIconPath.put(IUMLRTElementTypes.PROTOCOL_MESSAGE_IN_ID, RT_MESSAGE_IN_ICON);
+		typeIdtoIconPath.put(IUMLRTElementTypes.PROTOCOL_MESSAGE_INOUT_ID, RT_MESSAGE_IN_OUT_ICON);
+		typeIdtoIconPath.put(IUMLRTElementTypes.PROTOCOL_MESSAGE_OUT_ID, RT_MESSAGE_OUT_ICON);
+		typeIdtoIconPath.put(IUMLRTElementTypes.PROTOCOL_MESSAGE_ID, RT_MESSAGE_UNDEFINED_ICON);
 	}
 
 	/**
@@ -90,13 +90,13 @@ public class UMLRTLabelProvider extends UMLFilteredLabelProvider {
 		Image image = null;
 		// a match was done. give a different icon given the value
 		switch (matchingTypeMatcher) {
-		case IUMLRTElementTypes.RT_MESSAGE_IN_ID:
+		case IUMLRTElementTypes.PROTOCOL_MESSAGE_IN_ID:
 			image = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(Activator.PLUGIN_ID, RT_MESSAGE_IN_ICON);
 			break;
-		case IUMLRTElementTypes.RT_MESSAGE_OUT_ID:
+		case IUMLRTElementTypes.PROTOCOL_MESSAGE_OUT_ID:
 			image = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(Activator.PLUGIN_ID, RT_MESSAGE_OUT_ICON);
 			break;
-		case IUMLRTElementTypes.RT_MESSAGE_INOUT_ID:
+		case IUMLRTElementTypes.PROTOCOL_MESSAGE_INOUT_ID:
 			image = org.eclipse.papyrus.infra.widgets.Activator.getDefault().getImage(Activator.PLUGIN_ID, RT_MESSAGE_IN_OUT_ICON);
 			break;
 		default:
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
index a463e322d87..c0bec3b2c6c 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/elementtypes/uml-rt.elementtypesconfigurations
@@ -160,8 +160,8 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_At0JAONwEeSMDu6IBsn9eg"
-      name="RTMessage"
-      identifier="org.eclipse.papyrus.umlrt.RTMessage">
+      name="ProtocolMessage"
+      identifier="org.eclipse.papyrus.umlrt.ProtocolMessage">
     <iconEntry
         xmi:id="_At0JAeNwEeSMDu6IBsn9eg"
         iconPath="/icons/full/obj16/Operation.gif"
@@ -181,13 +181,13 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_1puuMOToEeSW0_lDigZ13g"
-      name="RTMessageIN"
-      identifier="org.eclipse.papyrus.umlrt.RTMessageIn">
+      name="ProtocolMessageIN"
+      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageIn">
     <iconEntry
         xmi:id="_7aYeMOToEeSW0_lDigZ13g"
         iconPath="/icons/full/obj16/Operation.gif"
         bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessage</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessage</specializedTypesID>
     <editHelperAdviceConfiguration
         xmi:id="_7aZFQOToEeSW0_lDigZ13g"
         name="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInEditHelperAdvice"
@@ -202,13 +202,13 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_Vv9-gOzDEeSbg9FMiG2BVg"
-      name="RTMessageIN"
-      identifier="org.eclipse.papyrus.umlrt.RTMessageOut">
+      name="ProtocolMessageOUT"
+      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageOut">
     <iconEntry
         xmi:id="_Vv9-gezDEeSbg9FMiG2BVg"
         iconPath="/icons/full/obj16/Operation.gif"
         bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessage</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessage</specializedTypesID>
     <editHelperAdviceConfiguration
         xmi:id="_Vv9-guzDEeSbg9FMiG2BVg"
         name="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageOutEditHelperAdvice"
@@ -223,13 +223,13 @@
   <elementTypeConfigurations
       xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration"
       xmi:id="_WBNfgOzDEeSbg9FMiG2BVg"
-      name="RTMessageINOUT"
-      identifier="org.eclipse.papyrus.umlrt.RTMessageInOut">
+      name="ProtocolMessageINOUT"
+      identifier="org.eclipse.papyrus.umlrt.ProtocolMessageInOut">
     <iconEntry
         xmi:id="_WBNfgezDEeSbg9FMiG2BVg"
         iconPath="/icons/full/obj16/Operation.gif"
         bundleId="org.eclipse.uml2.uml.edit"/>
-    <specializedTypesID>org.eclipse.papyrus.umlrt.RTMessage</specializedTypesID>
+    <specializedTypesID>org.eclipse.papyrus.umlrt.ProtocolMessage</specializedTypesID>
     <editHelperAdviceConfiguration
         xmi:id="_WBNfguzDEeSbg9FMiG2BVg"
         name="org.eclipse.papyrus.umlrt.custom.advice.OperationAsMessageInOutEditHelperAdvice"
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/IUMLRTElementTypes.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/IUMLRTElementTypes.java
index 2e198dfcd95..a54a50ebf99 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/IUMLRTElementTypes.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/IUMLRTElementTypes.java
@@ -33,8 +33,11 @@ public interface IUMLRTElementTypes {
 	
 	public static final String RT_EXCLUDED_ELEMENT_ID = "org.eclipse.papyrus.umlrt.RTRExcludedElement";//$NON-NLS-1$
 
-	public static final String RT_MESSAGE_ID = "org.eclipse.papyrus.umlrt.RTMessage";
-	public static final String RT_MESSAGE_IN_ID = "org.eclipse.papyrus.umlrt.RTMessageIn";
-	public static final String RT_MESSAGE_OUT_ID = "org.eclipse.papyrus.umlrt.RTMessageOut";
-	public static final String RT_MESSAGE_INOUT_ID = "org.eclipse.papyrus.umlrt.RTMessageInOut";
+	public static final String PROTOCOL_MESSAGE_ID = "org.eclipse.papyrus.umlrt.ProtocolMessage";//$NON-NLS-1$
+	
+	public static final String PROTOCOL_MESSAGE_IN_ID = "org.eclipse.papyrus.umlrt.ProtocolMessageIn";//$NON-NLS-1$
+	
+	public static final String PROTOCOL_MESSAGE_OUT_ID = "org.eclipse.papyrus.umlrt.ProtocolMessageOut";//$NON-NLS-1$
+	
+	public static final String PROTOCOL_MESSAGE_INOUT_ID = "org.eclipse.papyrus.umlrt.ProtocolMessageInOut";//$NON-NLS-1$
 }
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java
index 95983142689..3fc311c0ca6 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/UMLRTElementTypesEnumerator.java
@@ -39,12 +39,15 @@ public class UMLRTElementTypesEnumerator extends AbstractElementTypeEnumerator i
 
 	public static final IHintedType RT_EXCLUDED_ELEMENT = (IHintedType) getElementType(RT_EXCLUDED_ELEMENT_ID);
 
-	public static final IHintedType RT_MESSAGE = (IHintedType) getElementType(RT_MESSAGE_ID);
-	public static final IHintedType RT_MESSAGE_IN = (IHintedType) getElementType(RT_MESSAGE_IN_ID);
-	public static final IHintedType RT_MESSAGE_OUT = (IHintedType) getElementType(RT_MESSAGE_OUT_ID);
-	public static final IHintedType RT_MESSAGE_INOUT = (IHintedType) getElementType(RT_MESSAGE_INOUT_ID);
-
-	private static final List<IHintedType> rtTypes = Arrays.asList(RT_MESSAGE_SET, PROTOCOL_CONTAINER, PROTOCOL, CAPSULE, CAPSULE_PART, RT_PORT, RT_CONNECTOR, RT_EXCLUDED_ELEMENT, RT_MESSAGE_IN, RT_MESSAGE_OUT, RT_MESSAGE_INOUT, RT_MESSAGE);
+	public static final IHintedType PROTOCOL_MESSAGE = (IHintedType) getElementType(PROTOCOL_MESSAGE_ID);
+	
+	public static final IHintedType PROTOCOL_MESSAGE_IN = (IHintedType) getElementType(PROTOCOL_MESSAGE_IN_ID);
+	
+	public static final IHintedType PROTOCOL_MESSAGE_OUT = (IHintedType) getElementType(PROTOCOL_MESSAGE_OUT_ID);
+	
+	public static final IHintedType PROTOCOL_MESSAGE_INOUT = (IHintedType) getElementType(PROTOCOL_MESSAGE_INOUT_ID);
+
+	private static final List<IHintedType> rtTypes = Arrays.asList(RT_MESSAGE_SET, PROTOCOL_CONTAINER, PROTOCOL, CAPSULE, CAPSULE_PART, RT_PORT, RT_CONNECTOR, RT_EXCLUDED_ELEMENT, PROTOCOL_MESSAGE_IN, PROTOCOL_MESSAGE_OUT, PROTOCOL_MESSAGE_INOUT, PROTOCOL_MESSAGE);
 
 	/**
 	 * Returns all the specific semantic element types for UML-RT
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/BehavioredClassifierEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/BehavioredClassifierEditHelperAdvice.java
index 0d560d8799b..4c30c5acbca 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/BehavioredClassifierEditHelperAdvice.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/BehavioredClassifierEditHelperAdvice.java
@@ -42,7 +42,7 @@ public class BehavioredClassifierEditHelperAdvice extends AbstractEditHelperAdvi
 			IElementType type = createElementRequest.getElementType();
 
 			// type should only be compatible with UMLRT::OperationAsMessages
-			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_MESSAGE_ID);
+			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.PROTOCOL_MESSAGE_ID);
 			// should not be null, otherwise, element type model is not loaded correctly. abort.
 			if (umlRTMessageType == null) {
 				Activator.log.debug("RTMessage element type is not accessible");
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/MessageSetEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/MessageSetEditHelperAdvice.java
index 3c359824a3e..ca3a0185e92 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/MessageSetEditHelperAdvice.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/MessageSetEditHelperAdvice.java
@@ -91,7 +91,7 @@ public class MessageSetEditHelperAdvice extends AbstractEditHelperAdvice {
 			IElementType type = createElementRequest.getElementType();
 
 			// type should only be compatible with UMLRT::OperationAsMessages
-			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_MESSAGE_ID);
+			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.PROTOCOL_MESSAGE_ID);
 			// should not be null, otherwise, element type model is not loaded correctly. abort.
 			if (umlRTMessageType == null) {
 				Activator.log.debug("RTMessage element type is not accessible");
@@ -113,7 +113,7 @@ public class MessageSetEditHelperAdvice extends AbstractEditHelperAdvice {
 	 */
 	@Override
 	protected ICommand getAfterCreateCommand(CreateElementRequest request) {
-		if (request.getElementType().getId().equals(IUMLRTElementTypes.RT_MESSAGE_IN_ID)) {
+		if (request.getElementType().getId().equals(IUMLRTElementTypes.PROTOCOL_MESSAGE_IN_ID)) {
 			EObject container = request.getContainer();
 			Element element = (Element)container;
 			org.eclipse.uml2.uml.Package pack = element.getNearestPackage();
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolContainerEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolContainerEditHelperAdvice.java
index a707295afa1..f6fa07ce85c 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolContainerEditHelperAdvice.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolContainerEditHelperAdvice.java
@@ -51,7 +51,7 @@ public class ProtocolContainerEditHelperAdvice extends AbstractEditHelperAdvice
 			IElementType type = createElementRequest.getElementType();
 
 			// type should only be compatible with UMLRT::OperationAsMessages
-			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_MESSAGE_ID);
+			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.PROTOCOL_MESSAGE_ID);
 			// should not be null, otherwise, element type model is not loaded correctly. abort.
 			if (umlRTMessageType == null) {
 				Activator.log.debug("RTMessage element type is not accessible");
@@ -83,7 +83,7 @@ public class ProtocolContainerEditHelperAdvice extends AbstractEditHelperAdvice
 			IElementType type = createElementRequest.getElementType();
 
 			// type should only be compatible with UMLRT::OperationAsMessages
-			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_MESSAGE_ID);
+			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.PROTOCOL_MESSAGE_ID);
 			// should not be null, otherwise, element type model is not loaded correctly. abort.
 			if (umlRTMessageType == null) {
 				Activator.log.debug("RTMessage element type is not accessible");
diff --git a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java
index ccc65637640..ccda68535dd 100644
--- a/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java
+++ b/extraplugins/umlrt/org.eclipse.papyrus.umlrt/src/org/eclipse/papyrus/umlrt/custom/advice/ProtocolEditHelperAdvice.java
@@ -89,7 +89,7 @@ public class ProtocolEditHelperAdvice extends AbstractEditHelperAdvice {
 			IElementType type = createElementRequest.getElementType();
 
 			// type should only be compatible with UMLRT::OperationAsMessages
-			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_MESSAGE_ID);
+			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.PROTOCOL_MESSAGE_ID);
 			// should not be null, otherwise, element type model is not loaded correctly. abort.
 			if (umlRTMessageType == null) {
 				Activator.log.debug("RTMessage element type is not accessible");
@@ -127,7 +127,7 @@ public class ProtocolEditHelperAdvice extends AbstractEditHelperAdvice {
 			IElementType type = createElementRequest.getElementType();
 
 			// type should only be compatible with UMLRT::OperationAsMessages
-			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.RT_MESSAGE_ID);
+			IElementType umlRTMessageType = ElementTypeRegistry.getInstance().getType(IUMLRTElementTypes.PROTOCOL_MESSAGE_ID);
 			// should not be null, otherwise, element type model is not loaded correctly. abort.
 			if (umlRTMessageType == null || type == null) {
 				Activator.log.debug("RTMessage element type is not accessible");
@@ -143,9 +143,9 @@ public class ProtocolEditHelperAdvice extends AbstractEditHelperAdvice {
 				GetEditContextCommand command = new GetEditContextCommand(request);
 				if (request.getEditContext() instanceof Collaboration) {
 					// retrieve all needed element types
-					IElementType rTMessageTypeIn = UMLRTElementTypesEnumerator.RT_MESSAGE_IN;
-					IElementType rTMessageTypeOut = UMLRTElementTypesEnumerator.RT_MESSAGE_OUT;
-					IElementType rTMessageTypeInOut = UMLRTElementTypesEnumerator.RT_MESSAGE_INOUT;
+					IElementType rTMessageTypeIn = UMLRTElementTypesEnumerator.PROTOCOL_MESSAGE_IN;
+					IElementType rTMessageTypeOut = UMLRTElementTypesEnumerator.PROTOCOL_MESSAGE_OUT;
+					IElementType rTMessageTypeInOut = UMLRTElementTypesEnumerator.PROTOCOL_MESSAGE_INOUT;
 					if (types.contains(rTMessageTypeIn)) {
 						command.setEditContext(ProtocolUtils.getMessageSetIn((Collaboration) request.getEditContext()));
 					} else if (types.contains(rTMessageTypeOut)) {