diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleClassifierBehaviorProperty.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleClassifierBehaviorProperty.xwt
index 12b8227..6fd4f94 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleClassifierBehaviorProperty.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleClassifierBehaviorProperty.xwt
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>	
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt
index 3c2229e..6fd4f94 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleConstraintBlock.xwt
@@ -6,4 +6,10 @@
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>	
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleCopy.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleCopy.xwt
index 12b8227..6fd4f94 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleCopy.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleCopy.xwt
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>	
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDeriveReqt.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDeriveReqt.xwt
index 12b8227..c560d52 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDeriveReqt.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleDeriveReqt.xwt
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>		
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleExpose.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleExpose.xwt
index 12b8227..c560d52 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleExpose.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleExpose.xwt
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>		
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFullPort.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFullPort.xwt
index 12b8227..b46fb73 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFullPort.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleFullPort.xwt
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+		<ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog>
+	</Composite>	
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleInterfaceBlock.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleInterfaceBlock.xwt
index 12b8227..b339086 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleInterfaceBlock.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleInterfaceBlock.xwt
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProblem.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProblem.xwt
index 12b8227..e49c1d0 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProblem.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProblem.xwt
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite xmlns:j="clr-namespace:java.lang"
 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"
 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<uml:CommentBodyWrapperEditor input="{Binding}"
+		property="UML:Comment:body"></uml:CommentBodyWrapperEditor>
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProxyPort.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProxyPort.xwt
index 12b8227..b46fb73 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProxyPort.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleProxyPort.xwt
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout numColumns="2"></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+		<ppe:ReferenceDialog input="{Binding}" property="UML:TypedElement:type"></ppe:ReferenceDialog>
+	</Composite>	
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRationale.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRationale.xwt
index 12b8227..00218e4 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRationale.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRationale.xwt
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite xmlns:j="clr-namespace:java.lang"
 	xmlns:ppel="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets.layout"
+	xmlns:uml="clr-namespace:org.eclipse.papyrus.uml.properties.widgets"
 	xmlns:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<uml:CommentBodyWrapperEditor input="{Binding}"
+		property="UML:Comment:body"></uml:CommentBodyWrapperEditor>	
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRefine.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRefine.xwt
index 12b8227..3dc2c73 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRefine.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleRefine.xwt
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
-		<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		<ppel:PropertiesLayout></ppel:PropertiesLayout>		
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleSatisfy.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleSatisfy.xwt
index 12b8227..6fd4f94 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleSatisfy.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleSatisfy.xwt
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>	
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTrace.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTrace.xwt
index 12b8227..c560d52 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTrace.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleTrace.xwt
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>		
 </Composite>
\ No newline at end of file
diff --git a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleVerify.xwt b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleVerify.xwt
index 12b8227..c560d52 100644
--- a/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleVerify.xwt
+++ b/gui/org.eclipse.papyrus.sysml14.ui/resources/properties/ui/SingleVerify.xwt
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Composite 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:x="http://www.eclipse.org/xwt" xmlns="http://www.eclipse.org/xwt/presentation"
+	xmlns:ppe="clr-namespace:org.eclipse.papyrus.infra.properties.ui.widgets">
 	<Composite.layout>
 		<ppel:PropertiesLayout></ppel:PropertiesLayout>
 	</Composite.layout>
+	<Composite>
+		<Composite.layout>
+			<ppel:PropertiesLayout></ppel:PropertiesLayout>
+		</Composite.layout>
+		<ppe:StringEditor input="{Binding}" property="UML:NamedElement:name"></ppe:StringEditor>
+	</Composite>		
 </Composite>
\ No newline at end of file