362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name

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

75 files changed, 282 insertions, 282 deletions

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/META-INF/MANIFEST.MF b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/META-INF/MANIFEST.MF
index 9722cd02c70..6f3e003bcc4 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/META-INF/MANIFEST.MF
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %pluginName

 Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.properties.view.sysml.Activator

+Bundle-Activator: org.eclipse.papyrus.sysml.properties.view.Activator

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

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/plugin.xml b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/plugin.xml
index 6f6fd627e2a..00cd9e9c395 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/plugin.xml
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/plugin.xml
@@ -2,14 +2,14 @@
 <?eclipse version="3.4"?>

 <plugin>

 <extension

-      point="org.eclipse.papyrus.properties.runtime.propertyEditorControllerProvider">

+      point="org.eclipse.papyrus.views.properties.runtime.propertyEditorControllerProvider">

    <propertyEditorControllerProvider

-         class="org.eclipse.papyrus.properties.runtime.controller.predefined.PredefinedPropertyControllerProvider"

+         class="org.eclipse.papyrus.views.properties.runtime.controller.predefined.PredefinedPropertyControllerProvider"

          description="this is the basic provider for SysML features"

-            id="org.eclipse.papyrus.properties.view.sysml.structuralFeaturesEMFTPredefinedControllers">

+            id="org.eclipse.papyrus.sysml.properties.view.structuralFeaturesEMFTPredefinedControllers">

       <Priority name="Lowest"/>

       <PredefinedControllers

-            id="org.eclipse.papyrus.properties.view.sysml.structuralFeaturesEMFTPredefinedControllers"

+            id="org.eclipse.papyrus.sysml.properties.view.structuralFeaturesEMFTPredefinedControllers"

             name="SysML Predefined Controllers for Structural Features"

             path="resources/sysml_predefined_controllers.xml">

       </PredefinedControllers>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/resources/sysml_predefined_controllers.xml b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/resources/sysml_predefined_controllers.xml
index 37a75051ee6..ae521a380d2 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/resources/sysml_predefined_controllers.xml
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/resources/sysml_predefined_controllers.xml
@@ -1,37 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?><!-- generated controller from sysml Package - 2010/08/27 - 13:59--><predefinedControllers>

-<!--predefined controller for View#viewPoint--><predefinedController id="emftEReferenceController" predefinedId="SysML_View_viewPoint"><feature handlerID="ReferenceStereotype" name="viewPoint" stereotypeName="SysML::ModelElements::View"/><editor id="org.eclipse.papyrus.properties.runtime.simpleReferencePropertyEditor" label="View Point:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::View"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for ViewPoint#stakeHolders--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_ViewPoint_stakeHolders"><feature handlerID="StringStereotype" name="stakeHolders" stereotypeName="SysML::ModelElements::ViewPoint"/><editor id="org.eclipse.papyrus.properties.runtime.multipleStructuralFeaturesPropertyEditor" label="Stake Holders:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::ViewPoint"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for ViewPoint#purpose--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_ViewPoint_purpose"><feature handlerID="StringStereotype" name="purpose" stereotypeName="SysML::ModelElements::ViewPoint"/><editor id="org.eclipse.papyrus.properties.runtime.textPropertyEditor" label="Purpose:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::ViewPoint"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for ViewPoint#concerns--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_ViewPoint_concerns"><feature handlerID="StringStereotype" name="concerns" stereotypeName="SysML::ModelElements::ViewPoint"/><editor id="org.eclipse.papyrus.properties.runtime.multipleStructuralFeaturesPropertyEditor" label="Concerns:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::ViewPoint"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for ViewPoint#languages--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_ViewPoint_languages"><feature handlerID="StringStereotype" name="languages" stereotypeName="SysML::ModelElements::ViewPoint"/><editor id="org.eclipse.papyrus.properties.runtime.multipleStructuralFeaturesPropertyEditor" label="Languages:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::ViewPoint"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for ViewPoint#methods--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_ViewPoint_methods"><feature handlerID="StringStereotype" name="methods" stereotypeName="SysML::ModelElements::ViewPoint"/><editor id="org.eclipse.papyrus.properties.runtime.multipleStructuralFeaturesPropertyEditor" label="Methods:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::ViewPoint"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Block#isEncapsulated--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_Block_isEncapsulated"><feature handlerID="BooleanStereotype" name="isEncapsulated" stereotypeName="SysML::Blocks::Block"/><editor id="org.eclipse.papyrus.properties.runtime.radioBoxPropertyEditor" label="Is Encapsulated:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::Block"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Unit#dimension--><predefinedController id="emftEReferenceController" predefinedId="SysML_Unit_dimension"><feature handlerID="ReferenceStereotype" name="dimension" stereotypeName="SysML::Blocks::Unit"/><editor id="org.eclipse.papyrus.properties.runtime.simpleReferencePropertyEditor" label="Dimension:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::Unit"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for ValueType#unit--><predefinedController id="emftEReferenceController" predefinedId="SysML_ValueType_unit"><feature handlerID="ReferenceStereotype" name="unit" stereotypeName="SysML::Blocks::ValueType"/><editor id="org.eclipse.papyrus.properties.runtime.simpleReferencePropertyEditor" label="Unit:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::ValueType"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for ValueType#dimension--><predefinedController id="emftEReferenceController" predefinedId="SysML_ValueType_dimension"><feature handlerID="ReferenceStereotype" name="dimension" stereotypeName="SysML::Blocks::ValueType"/><editor id="org.eclipse.papyrus.properties.runtime.simpleReferencePropertyEditor" label="Dimension:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::ValueType"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for NestedConnectorEnd#propertyPath--><predefinedController id="emftEReferenceController" predefinedId="SysML_NestedConnectorEnd_propertyPath"><feature handlerID="ReferenceStereotype" name="propertyPath" stereotypeName="SysML::Blocks::NestedConnectorEnd"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Property Path:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::NestedConnectorEnd"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for ParticipantProperty#end--><predefinedController id="emftEReferenceController" predefinedId="SysML_ParticipantProperty_end"><feature handlerID="ReferenceStereotype" name="end" stereotypeName="SysML::Blocks::ParticipantProperty"/><editor id="org.eclipse.papyrus.properties.runtime.simpleReferencePropertyEditor" label="End:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::ParticipantProperty"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for ConnectorProperty#connector--><predefinedController id="emftEReferenceController" predefinedId="SysML_ConnectorProperty_connector"><feature handlerID="ReferenceStereotype" name="connector" stereotypeName="SysML::Blocks::ConnectorProperty"/><editor id="org.eclipse.papyrus.properties.runtime.simpleReferencePropertyEditor" label="Connector:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::ConnectorProperty"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for FlowPort#isAtomic--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_FlowPort_isAtomic"><feature handlerID="BooleanStereotype" name="isAtomic" stereotypeName="SysML::PortAndFlows::FlowPort"/><editor id="org.eclipse.papyrus.properties.runtime.radioBoxPropertyEditor" label="Is Atomic:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::PortAndFlows::FlowPort"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for FlowPort#isConjugated--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_FlowPort_isConjugated"><feature handlerID="BooleanStereotype" name="isConjugated" stereotypeName="SysML::PortAndFlows::FlowPort"/><editor id="org.eclipse.papyrus.properties.runtime.radioBoxPropertyEditor" label="Is Conjugated:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::PortAndFlows::FlowPort"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for FlowPort#direction--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_FlowPort_direction"><feature handlerID="EnumerationStereotype" name="direction" stereotypeName="SysML::PortAndFlows::FlowPort"/><editor id="org.eclipse.papyrus.properties.runtime.radioBoxPropertyEditor" label="Direction:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::PortAndFlows::FlowPort"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for FlowProperty#direction--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_FlowProperty_direction"><feature handlerID="EnumerationStereotype" name="direction" stereotypeName="SysML::PortAndFlows::FlowProperty"/><editor id="org.eclipse.papyrus.properties.runtime.radioBoxPropertyEditor" label="Direction:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::PortAndFlows::FlowProperty"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for ItemFlow#itemProperty--><predefinedController id="emftEReferenceController" predefinedId="SysML_ItemFlow_itemProperty"><feature handlerID="ReferenceStereotype" name="itemProperty" stereotypeName="SysML::PortAndFlows::ItemFlow"/><editor id="org.eclipse.papyrus.properties.runtime.simpleReferencePropertyEditor" label="Item Property:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::PortAndFlows::ItemFlow"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Rate#rate--><predefinedController id="emftEReferenceController" predefinedId="SysML_Rate_rate"><feature handlerID="ReferenceStereotype" name="rate" stereotypeName="SysML::Activities::Rate"/><editor id="org.eclipse.papyrus.properties.runtime.simpleReferencePropertyEditor" label="Rate:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Activities::Rate"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Probability#probability--><predefinedController id="emftEReferenceController" predefinedId="SysML_Probability_probability"><feature handlerID="ReferenceStereotype" name="probability" stereotypeName="SysML::Activities::Probability"/><editor id="org.eclipse.papyrus.properties.runtime.simpleReferencePropertyEditor" label="Probability:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Activities::Probability"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Allocated#allocatedFrom--><predefinedController id="emftEReferenceController" predefinedId="SysML_Allocated_allocatedFrom"><feature handlerID="ReferenceStereotype" name="allocatedFrom" stereotypeName="SysML::Allocations::Allocated"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Allocated From:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Allocations::Allocated"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Allocated#allocatedTo--><predefinedController id="emftEReferenceController" predefinedId="SysML_Allocated_allocatedTo"><feature handlerID="ReferenceStereotype" name="allocatedTo" stereotypeName="SysML::Allocations::Allocated"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Allocated To:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Allocations::Allocated"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for TestCase#verifies--><predefinedController id="emftEReferenceController" predefinedId="SysML_TestCase_verifies"><feature handlerID="ReferenceStereotype" name="verifies" stereotypeName="SysML::Requirements::TestCase"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Verifies:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::TestCase"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Requirement#text--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_Requirement_text"><feature handlerID="StringStereotype" name="text" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.properties.runtime.textPropertyEditor" label="Text:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Requirement#id--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_Requirement_id"><feature handlerID="StringStereotype" name="id" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.properties.runtime.textPropertyEditor" label="Id:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Requirement#derived--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_derived"><feature handlerID="ReferenceStereotype" name="derived" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Derived:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Requirement#derivedFrom--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_derivedFrom"><feature handlerID="ReferenceStereotype" name="derivedFrom" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Derived From:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Requirement#satisfiedBy--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_satisfiedBy"><feature handlerID="ReferenceStereotype" name="satisfiedBy" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Satisfied By:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Requirement#refinedBy--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_refinedBy"><feature handlerID="ReferenceStereotype" name="refinedBy" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Refined By:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Requirement#tracedTo--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_tracedTo"><feature handlerID="ReferenceStereotype" name="tracedTo" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Traced To:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Requirement#verifiedBy--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_verifiedBy"><feature handlerID="ReferenceStereotype" name="verifiedBy" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Verified By:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for Requirement#master--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_master"><feature handlerID="ReferenceStereotype" name="master" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.properties.runtime.simpleReferencePropertyEditor" label="Master:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for RequirementRelated#tracedFrom--><predefinedController id="emftEReferenceController" predefinedId="SysML_RequirementRelated_tracedFrom"><feature handlerID="ReferenceStereotype" name="tracedFrom" stereotypeName="SysML::Requirements::RequirementRelated"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Traced From:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::RequirementRelated"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for RequirementRelated#satisfies--><predefinedController id="emftEReferenceController" predefinedId="SysML_RequirementRelated_satisfies"><feature handlerID="ReferenceStereotype" name="satisfies" stereotypeName="SysML::Requirements::RequirementRelated"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Satisfies:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::RequirementRelated"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for RequirementRelated#refines--><predefinedController id="emftEReferenceController" predefinedId="SysML_RequirementRelated_refines"><feature handlerID="ReferenceStereotype" name="refines" stereotypeName="SysML::Requirements::RequirementRelated"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Refines:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::RequirementRelated"/></appliedStereotypes></constraints></predefinedController>

-<!--predefined controller for RequirementRelated#verifies--><predefinedController id="emftEReferenceController" predefinedId="SysML_RequirementRelated_verifies"><feature handlerID="ReferenceStereotype" name="verifies" stereotypeName="SysML::Requirements::RequirementRelated"/><editor id="org.eclipse.papyrus.properties.runtime.multipleReferencePropertyEditor" label="Verifies:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::RequirementRelated"/></appliedStereotypes></constraints></predefinedController></predefinedControllers>
\ No newline at end of file
+<!--predefined controller for View#viewPoint--><predefinedController id="emftEReferenceController" predefinedId="SysML_View_viewPoint"><feature handlerID="ReferenceStereotype" name="viewPoint" stereotypeName="SysML::ModelElements::View"/><editor id="org.eclipse.papyrus.views.properties.runtime.simpleReferencePropertyEditor" label="View Point:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::View"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for ViewPoint#stakeHolders--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_ViewPoint_stakeHolders"><feature handlerID="StringStereotype" name="stakeHolders" stereotypeName="SysML::ModelElements::ViewPoint"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleStructuralFeaturesPropertyEditor" label="Stake Holders:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::ViewPoint"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for ViewPoint#purpose--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_ViewPoint_purpose"><feature handlerID="StringStereotype" name="purpose" stereotypeName="SysML::ModelElements::ViewPoint"/><editor id="org.eclipse.papyrus.views.properties.runtime.textPropertyEditor" label="Purpose:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::ViewPoint"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for ViewPoint#concerns--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_ViewPoint_concerns"><feature handlerID="StringStereotype" name="concerns" stereotypeName="SysML::ModelElements::ViewPoint"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleStructuralFeaturesPropertyEditor" label="Concerns:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::ViewPoint"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for ViewPoint#languages--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_ViewPoint_languages"><feature handlerID="StringStereotype" name="languages" stereotypeName="SysML::ModelElements::ViewPoint"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleStructuralFeaturesPropertyEditor" label="Languages:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::ViewPoint"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for ViewPoint#methods--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_ViewPoint_methods"><feature handlerID="StringStereotype" name="methods" stereotypeName="SysML::ModelElements::ViewPoint"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleStructuralFeaturesPropertyEditor" label="Methods:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::ModelElements::ViewPoint"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Block#isEncapsulated--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_Block_isEncapsulated"><feature handlerID="BooleanStereotype" name="isEncapsulated" stereotypeName="SysML::Blocks::Block"/><editor id="org.eclipse.papyrus.views.properties.runtime.radioBoxPropertyEditor" label="Is Encapsulated:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::Block"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Unit#dimension--><predefinedController id="emftEReferenceController" predefinedId="SysML_Unit_dimension"><feature handlerID="ReferenceStereotype" name="dimension" stereotypeName="SysML::Blocks::Unit"/><editor id="org.eclipse.papyrus.views.properties.runtime.simpleReferencePropertyEditor" label="Dimension:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::Unit"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for ValueType#unit--><predefinedController id="emftEReferenceController" predefinedId="SysML_ValueType_unit"><feature handlerID="ReferenceStereotype" name="unit" stereotypeName="SysML::Blocks::ValueType"/><editor id="org.eclipse.papyrus.views.properties.runtime.simpleReferencePropertyEditor" label="Unit:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::ValueType"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for ValueType#dimension--><predefinedController id="emftEReferenceController" predefinedId="SysML_ValueType_dimension"><feature handlerID="ReferenceStereotype" name="dimension" stereotypeName="SysML::Blocks::ValueType"/><editor id="org.eclipse.papyrus.views.properties.runtime.simpleReferencePropertyEditor" label="Dimension:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::ValueType"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for NestedConnectorEnd#propertyPath--><predefinedController id="emftEReferenceController" predefinedId="SysML_NestedConnectorEnd_propertyPath"><feature handlerID="ReferenceStereotype" name="propertyPath" stereotypeName="SysML::Blocks::NestedConnectorEnd"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Property Path:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::NestedConnectorEnd"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for ParticipantProperty#end--><predefinedController id="emftEReferenceController" predefinedId="SysML_ParticipantProperty_end"><feature handlerID="ReferenceStereotype" name="end" stereotypeName="SysML::Blocks::ParticipantProperty"/><editor id="org.eclipse.papyrus.views.properties.runtime.simpleReferencePropertyEditor" label="End:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::ParticipantProperty"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for ConnectorProperty#connector--><predefinedController id="emftEReferenceController" predefinedId="SysML_ConnectorProperty_connector"><feature handlerID="ReferenceStereotype" name="connector" stereotypeName="SysML::Blocks::ConnectorProperty"/><editor id="org.eclipse.papyrus.views.properties.runtime.simpleReferencePropertyEditor" label="Connector:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Blocks::ConnectorProperty"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for FlowPort#isAtomic--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_FlowPort_isAtomic"><feature handlerID="BooleanStereotype" name="isAtomic" stereotypeName="SysML::PortAndFlows::FlowPort"/><editor id="org.eclipse.papyrus.views.properties.runtime.radioBoxPropertyEditor" label="Is Atomic:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::PortAndFlows::FlowPort"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for FlowPort#isConjugated--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_FlowPort_isConjugated"><feature handlerID="BooleanStereotype" name="isConjugated" stereotypeName="SysML::PortAndFlows::FlowPort"/><editor id="org.eclipse.papyrus.views.properties.runtime.radioBoxPropertyEditor" label="Is Conjugated:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::PortAndFlows::FlowPort"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for FlowPort#direction--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_FlowPort_direction"><feature handlerID="EnumerationStereotype" name="direction" stereotypeName="SysML::PortAndFlows::FlowPort"/><editor id="org.eclipse.papyrus.views.properties.runtime.radioBoxPropertyEditor" label="Direction:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::PortAndFlows::FlowPort"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for FlowProperty#direction--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_FlowProperty_direction"><feature handlerID="EnumerationStereotype" name="direction" stereotypeName="SysML::PortAndFlows::FlowProperty"/><editor id="org.eclipse.papyrus.views.properties.runtime.radioBoxPropertyEditor" label="Direction:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::PortAndFlows::FlowProperty"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for ItemFlow#itemProperty--><predefinedController id="emftEReferenceController" predefinedId="SysML_ItemFlow_itemProperty"><feature handlerID="ReferenceStereotype" name="itemProperty" stereotypeName="SysML::PortAndFlows::ItemFlow"/><editor id="org.eclipse.papyrus.views.properties.runtime.simpleReferencePropertyEditor" label="Item Property:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::PortAndFlows::ItemFlow"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Rate#rate--><predefinedController id="emftEReferenceController" predefinedId="SysML_Rate_rate"><feature handlerID="ReferenceStereotype" name="rate" stereotypeName="SysML::Activities::Rate"/><editor id="org.eclipse.papyrus.views.properties.runtime.simpleReferencePropertyEditor" label="Rate:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Activities::Rate"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Probability#probability--><predefinedController id="emftEReferenceController" predefinedId="SysML_Probability_probability"><feature handlerID="ReferenceStereotype" name="probability" stereotypeName="SysML::Activities::Probability"/><editor id="org.eclipse.papyrus.views.properties.runtime.simpleReferencePropertyEditor" label="Probability:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Activities::Probability"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Allocated#allocatedFrom--><predefinedController id="emftEReferenceController" predefinedId="SysML_Allocated_allocatedFrom"><feature handlerID="ReferenceStereotype" name="allocatedFrom" stereotypeName="SysML::Allocations::Allocated"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Allocated From:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Allocations::Allocated"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Allocated#allocatedTo--><predefinedController id="emftEReferenceController" predefinedId="SysML_Allocated_allocatedTo"><feature handlerID="ReferenceStereotype" name="allocatedTo" stereotypeName="SysML::Allocations::Allocated"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Allocated To:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Allocations::Allocated"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for TestCase#verifies--><predefinedController id="emftEReferenceController" predefinedId="SysML_TestCase_verifies"><feature handlerID="ReferenceStereotype" name="verifies" stereotypeName="SysML::Requirements::TestCase"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Verifies:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::TestCase"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Requirement#text--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_Requirement_text"><feature handlerID="StringStereotype" name="text" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.views.properties.runtime.textPropertyEditor" label="Text:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Requirement#id--><predefinedController id="emftStructuralFeatureController" predefinedId="SysML_Requirement_id"><feature handlerID="StringStereotype" name="id" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.views.properties.runtime.textPropertyEditor" label="Id:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Requirement#derived--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_derived"><feature handlerID="ReferenceStereotype" name="derived" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Derived:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Requirement#derivedFrom--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_derivedFrom"><feature handlerID="ReferenceStereotype" name="derivedFrom" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Derived From:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Requirement#satisfiedBy--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_satisfiedBy"><feature handlerID="ReferenceStereotype" name="satisfiedBy" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Satisfied By:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Requirement#refinedBy--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_refinedBy"><feature handlerID="ReferenceStereotype" name="refinedBy" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Refined By:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Requirement#tracedTo--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_tracedTo"><feature handlerID="ReferenceStereotype" name="tracedTo" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Traced To:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Requirement#verifiedBy--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_verifiedBy"><feature handlerID="ReferenceStereotype" name="verifiedBy" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Verified By:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for Requirement#master--><predefinedController id="emftEReferenceController" predefinedId="SysML_Requirement_master"><feature handlerID="ReferenceStereotype" name="master" stereotypeName="SysML::Requirements::Requirement"/><editor id="org.eclipse.papyrus.views.properties.runtime.simpleReferencePropertyEditor" label="Master:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::Requirement"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for RequirementRelated#tracedFrom--><predefinedController id="emftEReferenceController" predefinedId="SysML_RequirementRelated_tracedFrom"><feature handlerID="ReferenceStereotype" name="tracedFrom" stereotypeName="SysML::Requirements::RequirementRelated"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Traced From:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::RequirementRelated"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for RequirementRelated#satisfies--><predefinedController id="emftEReferenceController" predefinedId="SysML_RequirementRelated_satisfies"><feature handlerID="ReferenceStereotype" name="satisfies" stereotypeName="SysML::Requirements::RequirementRelated"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Satisfies:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::RequirementRelated"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for RequirementRelated#refines--><predefinedController id="emftEReferenceController" predefinedId="SysML_RequirementRelated_refines"><feature handlerID="ReferenceStereotype" name="refines" stereotypeName="SysML::Requirements::RequirementRelated"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Refines:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::RequirementRelated"/></appliedStereotypes></constraints></predefinedController>

+<!--predefined controller for RequirementRelated#verifies--><predefinedController id="emftEReferenceController" predefinedId="SysML_RequirementRelated_verifies"><feature handlerID="ReferenceStereotype" name="verifies" stereotypeName="SysML::Requirements::RequirementRelated"/><editor id="org.eclipse.papyrus.views.properties.runtime.multipleReferencePropertyEditor" label="Verifies:" labelPosition="16384"/><constraints><appliedStereotypes><appliedStereotype qualifiedName="SysML::Requirements::RequirementRelated"/></appliedStereotypes></constraints></predefinedController></predefinedControllers>
\ No newline at end of file
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/src/org/eclipse/papyrus/properties/view/sysml/Activator.java b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/src/org/eclipse/papyrus/sysml/properties/view/Activator.java
index 06a2c6620e6..8ea156a173a 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/src/org/eclipse/papyrus/properties/view/sysml/Activator.java
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties.view/src/org/eclipse/papyrus/sysml/properties/view/Activator.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.properties.view.sysml;

+package org.eclipse.papyrus.sysml.properties.view;

 

 import org.eclipse.ui.plugin.AbstractUIPlugin;

 import org.osgi.framework.BundleContext;

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
index 17ba4979e08..d2ffd583552 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-Version: 0.9.0.qualifier

 Bundle-Name: %Bundle-Name

 Bundle-ManifestVersion: 2

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

+Bundle-Activator: org.eclipse.papyrus.sysml.properties.Activator

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

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/SysML.ctx b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/SysML.ctx
index f8bd0bc6d0f..251ab0b66e0 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/SysML.ctx
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/SysML.ctx
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

   <tabs label="SysML" id="basicTabSysML" category="org.eclipse.papyrus" priority="20">

     <sections name="SingleConform" sectionFile="ui/SingleConform.xwt">

       <widget href="ui/SingleConform.xwt#/"/>

@@ -203,397 +203,397 @@
   </tabs>

   <views name="SingleConform" sections="//@tabs.0/@sections.0" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConform">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::ModelElements::Conform"/>

     </constraints>

   </views>

   <views name="MultipleConform" sections="//@tabs.0/@sections.1" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConform">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::ModelElements::Conform"/>

     </constraints>

   </views>

   <views name="SingleView" sections="//@tabs.0/@sections.2" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleView">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::ModelElements::View"/>

     </constraints>

   </views>

   <views name="MultipleView" sections="//@tabs.0/@sections.3" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleView">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::ModelElements::View"/>

     </constraints>

   </views>

   <views name="SingleViewPoint" sections="//@tabs.0/@sections.4" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleViewPoint">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::ModelElements::ViewPoint"/>

     </constraints>

   </views>

   <views name="MultipleViewPoint" sections="//@tabs.0/@sections.5" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleViewPoint">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::ModelElements::ViewPoint"/>

     </constraints>

   </views>

   <views name="SingleBlock" sections="//@tabs.0/@sections.6" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBlock">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::Block"/>

     </constraints>

   </views>

   <views name="MultipleBlock" sections="//@tabs.0/@sections.7" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBlock">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::Block"/>

     </constraints>

   </views>

   <views name="SingleDistributedProperty" sections="//@tabs.0/@sections.8" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDistributedProperty">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::DistributedProperty"/>

     </constraints>

   </views>

   <views name="MultipleDistributedProperty" sections="//@tabs.0/@sections.9" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDistributedProperty">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::DistributedProperty"/>

     </constraints>

   </views>

   <views name="SingleDimension" sections="//@tabs.0/@sections.10" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDimension">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::Dimension"/>

     </constraints>

   </views>

   <views name="MultipleDimension" sections="//@tabs.0/@sections.11" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDimension">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::Dimension"/>

     </constraints>

   </views>

   <views name="SingleUnit" sections="//@tabs.0/@sections.12" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleUnit">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::Unit"/>

     </constraints>

   </views>

   <views name="MultipleUnit" sections="//@tabs.0/@sections.13" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleUnit">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::Unit"/>

     </constraints>

   </views>

   <views name="SingleValueType" sections="//@tabs.0/@sections.14" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleValueType">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::ValueType"/>

     </constraints>

   </views>

   <views name="MultipleValueType" sections="//@tabs.0/@sections.15" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleValueType">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::ValueType"/>

     </constraints>

   </views>

   <views name="SingleNestedConnectorEnd" sections="//@tabs.0/@sections.16" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleNestedConnectorEnd">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::NestedConnectorEnd"/>

     </constraints>

   </views>

   <views name="MultipleNestedConnectorEnd" sections="//@tabs.0/@sections.17" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleNestedConnectorEnd">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::NestedConnectorEnd"/>

     </constraints>

   </views>

   <views name="SingleParticipantProperty" sections="//@tabs.0/@sections.18" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleParticipantProperty">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::ParticipantProperty"/>

     </constraints>

   </views>

   <views name="MultipleParticipantProperty" sections="//@tabs.0/@sections.19" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleParticipantProperty">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::ParticipantProperty"/>

     </constraints>

   </views>

   <views name="SingleConnectorProperty" sections="//@tabs.0/@sections.20" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConnectorProperty">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::ConnectorProperty"/>

     </constraints>

   </views>

   <views name="MultipleConnectorProperty" sections="//@tabs.0/@sections.21" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConnectorProperty">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::ConnectorProperty"/>

     </constraints>

   </views>

   <views name="SingleBindingConnector" sections="//@tabs.0/@sections.22" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleBindingConnector">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::BindingConnector"/>

     </constraints>

   </views>

   <views name="MultipleBindingConnector" sections="//@tabs.0/@sections.23" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleBindingConnector">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::BindingConnector"/>

     </constraints>

   </views>

   <views name="SinglePropertySpecificType" sections="//@tabs.0/@sections.24" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSinglePropertySpecificType">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::PropertySpecificType"/>

     </constraints>

   </views>

   <views name="MultiplePropertySpecificType" sections="//@tabs.0/@sections.25" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultiplePropertySpecificType">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Blocks::PropertySpecificType"/>

     </constraints>

   </views>

   <views name="SingleFlowPort" sections="//@tabs.0/@sections.26" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFlowPort">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::PortAndFlows::FlowPort"/>

     </constraints>

   </views>

   <views name="MultipleFlowPort" sections="//@tabs.0/@sections.27" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFlowPort">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::PortAndFlows::FlowPort"/>

     </constraints>

   </views>

   <views name="SingleFlowProperty" sections="//@tabs.0/@sections.28" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFlowProperty">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::PortAndFlows::FlowProperty"/>

     </constraints>

   </views>

   <views name="MultipleFlowProperty" sections="//@tabs.0/@sections.29" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFlowProperty">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::PortAndFlows::FlowProperty"/>

     </constraints>

   </views>

   <views name="SingleFlowSpecification" sections="//@tabs.0/@sections.30" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleFlowSpecification">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::PortAndFlows::FlowSpecification"/>

     </constraints>

   </views>

   <views name="MultipleFlowSpecification" sections="//@tabs.0/@sections.31" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleFlowSpecification">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::PortAndFlows::FlowSpecification"/>

     </constraints>

   </views>

   <views name="SingleItemFlow" sections="//@tabs.0/@sections.32" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleItemFlow">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::PortAndFlows::ItemFlow"/>

     </constraints>

   </views>

   <views name="MultipleItemFlow" sections="//@tabs.0/@sections.33" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleItemFlow">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::PortAndFlows::ItemFlow"/>

     </constraints>

   </views>

   <views name="SingleConstraintBlock" sections="//@tabs.0/@sections.34" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConstraintBlock">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Constraints::ConstraintBlock"/>

     </constraints>

   </views>

   <views name="MultipleConstraintBlock" sections="//@tabs.0/@sections.35" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConstraintBlock">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Constraints::ConstraintBlock"/>

     </constraints>

   </views>

   <views name="SingleConstraintProperty" sections="//@tabs.0/@sections.36" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleConstraintProperty">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Constraints::ConstraintProperty"/>

     </constraints>

   </views>

   <views name="MultipleConstraintProperty" sections="//@tabs.0/@sections.37" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleConstraintProperty">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Constraints::ConstraintProperty"/>

     </constraints>

   </views>

   <views name="SingleOptional" sections="//@tabs.0/@sections.38" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleOptional">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Optional"/>

     </constraints>

   </views>

   <views name="MultipleOptional" sections="//@tabs.0/@sections.39" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleOptional">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Optional"/>

     </constraints>

   </views>

   <views name="SingleRate" sections="//@tabs.0/@sections.40" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRate">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Rate"/>

     </constraints>

   </views>

   <views name="MultipleRate" sections="//@tabs.0/@sections.41" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRate">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Rate"/>

     </constraints>

   </views>

   <views name="SingleProbability" sections="//@tabs.0/@sections.42" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleProbability">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Probability"/>

     </constraints>

   </views>

   <views name="MultipleProbability" sections="//@tabs.0/@sections.43" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleProbability">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Probability"/>

     </constraints>

   </views>

   <views name="SingleContinuous" sections="//@tabs.0/@sections.44" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleContinuous">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Continuous"/>

     </constraints>

   </views>

   <views name="MultipleContinuous" sections="//@tabs.0/@sections.45" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleContinuous">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Continuous"/>

     </constraints>

   </views>

   <views name="SingleDiscrete" sections="//@tabs.0/@sections.46" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleDiscrete">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Discrete"/>

     </constraints>

   </views>

   <views name="MultipleDiscrete" sections="//@tabs.0/@sections.47" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleDiscrete">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Discrete"/>

     </constraints>

   </views>

   <views name="SingleControlOperator" sections="//@tabs.0/@sections.48" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleControlOperator">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::ControlOperator"/>

     </constraints>

   </views>

   <views name="MultipleControlOperator" sections="//@tabs.0/@sections.49" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleControlOperator">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::ControlOperator"/>

     </constraints>

   </views>

   <views name="SingleNoBuffer" sections="//@tabs.0/@sections.50" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleNoBuffer">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::NoBuffer"/>

     </constraints>

   </views>

   <views name="MultipleNoBuffer" sections="//@tabs.0/@sections.51" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleNoBuffer">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::NoBuffer"/>

     </constraints>

   </views>

   <views name="SingleOverwrite" sections="//@tabs.0/@sections.52" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleOverwrite">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Overwrite"/>

     </constraints>

   </views>

   <views name="MultipleOverwrite" sections="//@tabs.0/@sections.53" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleOverwrite">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Activities::Overwrite"/>

     </constraints>

   </views>

   <views name="SingleAllocate" sections="//@tabs.0/@sections.54" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAllocate">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Allocations::Allocate"/>

     </constraints>

   </views>

   <views name="MultipleAllocate" sections="//@tabs.0/@sections.55" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAllocate">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Allocations::Allocate"/>

     </constraints>

   </views>

   <views name="SingleAllocated" sections="//@tabs.0/@sections.56" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAllocated">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Allocations::Allocated"/>

     </constraints>

   </views>

   <views name="MultipleAllocated" sections="//@tabs.0/@sections.57" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAllocated">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Allocations::Allocated"/>

     </constraints>

   </views>

   <views name="SingleAllocateActivityPartition" sections="//@tabs.0/@sections.58" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleAllocateActivityPartition">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Allocations::AllocateActivityPartition"/>

     </constraints>

   </views>

   <views name="MultipleAllocateActivityPartition" sections="//@tabs.0/@sections.59" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleAllocateActivityPartition">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Allocations::AllocateActivityPartition"/>

     </constraints>

   </views>

   <views name="SingleTestCase" sections="//@tabs.0/@sections.60" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleTestCase">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Requirements::TestCase"/>

     </constraints>

   </views>

   <views name="MultipleTestCase" sections="//@tabs.0/@sections.61" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleTestCase">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Requirements::TestCase"/>

     </constraints>

   </views>

   <views name="SingleRequirement" sections="//@tabs.0/@sections.62" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRequirement">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Requirements::Requirement"/>

     </constraints>

   </views>

   <views name="MultipleRequirement" sections="//@tabs.0/@sections.63" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRequirement">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Requirements::Requirement"/>

     </constraints>

   </views>

   <views name="SingleRequirementRelated" sections="//@tabs.0/@sections.64" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isSingleRequirementRelated">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Requirements::RequirementRelated"/>

     </constraints>

   </views>

   <views name="MultipleRequirementRelated" sections="//@tabs.0/@sections.65" elementMultiplicity="-1" automaticContext="true">

     <constraints xsi:type="contexts:SimpleConstraint" name="isMultipleRequirementRelated">

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

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

       <properties xsi:type="contexts:ValueProperty" name="stereotypeName" value="SysML::Requirements::RequirementRelated"/>

     </constraints>

   </views>

@@ -602,85 +602,85 @@
       <elements name="Continuous" supertypes="//@dataContexts.0/@elements.0/@elements.5"/>

       <elements name="Discrete" supertypes="//@dataContexts.0/@elements.0/@elements.5"/>

       <elements name="NoBuffer">

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

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

       </elements>

       <elements name="Overwrite">

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

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

       </elements>

       <elements name="Probability">

         <properties name="probability" type="Reference"/>

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

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

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

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

       </elements>

       <elements name="Rate">

         <properties name="rate" type="Reference"/>

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

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

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

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

       </elements>

       <elements name="ControlOperator">

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

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

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

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

       </elements>

       <elements name="Optional">

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

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

       </elements>

     </elements>

     <elements xsi:type="contexts:DataContextPackage" name="PortAndFlows">

       <elements name="FlowSpecification">

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

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

       </elements>

       <elements name="FlowProperty">

         <properties name="direction" type="Enumeration"/>

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

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

       </elements>

       <elements name="FlowPort">

         <properties name="isAtomic" type="Boolean"/>

         <properties name="direction" type="Enumeration"/>

         <properties name="isConjugated" type="Boolean"/>

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

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

       </elements>

       <elements name="ItemFlow">

         <properties name="itemProperty" type="Reference"/>

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

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

       </elements>

     </elements>

     <elements xsi:type="contexts:DataContextPackage" name="Blocks">

       <elements name="Dimension">

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

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

       </elements>

       <elements name="Unit">

         <properties name="dimension" type="Reference"/>

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

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

       </elements>

       <elements name="DistributedProperty">

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

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

       </elements>

       <elements name="Block">

         <properties name="isEncapsulated" type="Boolean"/>

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

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

       </elements>

       <elements name="ValueType">

         <properties name="dimension" type="Reference"/>

         <properties name="unit" type="Reference"/>

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

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

       </elements>

       <elements name="ParticipantProperty">

         <properties name="end" type="Reference"/>

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

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

       </elements>

       <elements name="NestedConnectorEnd">

         <properties name="propertyPath" type="Reference"/>

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

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

       </elements>

       <elements name="PropertySpecificType">

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

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

       </elements>

       <elements name="ConnectorProperty">

         <properties name="connector" type="Reference"/>

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

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

       </elements>

       <elements name="BindingConnector">

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

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

       </elements>

     </elements>

     <elements xsi:type="contexts:DataContextPackage" name="Requirements">

@@ -694,25 +694,25 @@
         <properties name="master" type="Reference"/>

         <properties name="derived" type="Reference"/>

         <properties name="id"/>

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

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

       </elements>

       <elements name="RequirementRelated">

         <properties name="refines" type="Reference"/>

         <properties name="verifies" type="Reference"/>

         <properties name="satisfies" type="Reference"/>

         <properties name="tracedFrom" type="Reference"/>

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

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

       </elements>

       <elements name="TestCase">

         <properties name="verifies" type="Reference"/>

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

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

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

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

       </elements>

     </elements>

     <elements xsi:type="contexts:DataContextPackage" name="ModelElements">

       <elements name="View">

         <properties name="viewPoint" type="Reference"/>

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

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

       </elements>

       <elements name="ViewPoint">

         <properties name="concerns"/>

@@ -720,16 +720,16 @@
         <properties name="methods"/>

         <properties name="purpose"/>

         <properties name="stakeHolders"/>

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

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

       </elements>

       <elements name="Conform">

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

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

       </elements>

       <elements name="Problem">

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

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

       </elements>

       <elements name="Rationale">

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

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

       </elements>

     </elements>

     <elements xsi:type="contexts:DataContextPackage" name="Interactions"/>

@@ -737,23 +737,23 @@
     <elements xsi:type="contexts:DataContextPackage" name="Constraints">

       <elements name="ConstraintBlock" supertypes="//@dataContexts.0/@elements.2/@elements.3"/>

       <elements name="ConstraintProperty">

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

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

       </elements>

     </elements>

     <elements xsi:type="contexts:DataContextPackage" name="Allocations">

       <elements name="Allocate">

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

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

       </elements>

       <elements name="Allocated">

         <properties name="allocatedFrom" type="Reference"/>

         <properties name="allocatedTo" type="Reference"/>

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

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

       </elements>

       <elements name="AllocateActivityPartition">

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

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

       </elements>

     </elements>

     <elements xsi:type="contexts:DataContextPackage" name="StateMachines"/>

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

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

   </dataContexts>

 </contexts:Context>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocate.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocate.xwt
index 778674da6ef..6745d1abeca 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocate.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocate.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocateActivityPartition.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocateActivityPartition.xwt
index 2c23bfa783d..fcdce7c71d2 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocateActivityPartition.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocateActivityPartition.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocated.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocated.xwt
index de079de1f93..3489f7aacc0 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocated.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleAllocated.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBindingConnector.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBindingConnector.xwt
index c6fb9819989..1bc98579ed2 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBindingConnector.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBindingConnector.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets.layout">

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

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBlock.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBlock.xwt
index 51fc2e17994..df2b263cbfd 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBlock.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleBlock.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConform.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConform.xwt
index f6994be2bbb..a77fa154f6d 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConform.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConform.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConnectorProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConnectorProperty.xwt
index ddec86d496f..b4e179767ab 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConnectorProperty.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConnectorProperty.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintBlock.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintBlock.xwt
index 64089dbf669..b918410a6b8 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintBlock.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintBlock.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintProperty.xwt
index c81b88afa30..7960c3e597d 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintProperty.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleConstraintProperty.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleContinuous.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleContinuous.xwt
index 74bd1c31d4b..fd4c051c229 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleContinuous.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleContinuous.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleControlOperator.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleControlOperator.xwt
index 606557856f1..c83838404fb 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleControlOperator.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleControlOperator.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets"

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDimension.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDimension.xwt
index 46e716ba6e0..28bd2a914a6 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDimension.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDimension.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDiscrete.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDiscrete.xwt
index 2e13bb4865f..4728a96a4ea 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDiscrete.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDiscrete.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDistributedProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDistributedProperty.xwt
index 53a9d61d3b3..3113db3f99d 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDistributedProperty.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleDistributedProperty.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowPort.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowPort.xwt
index 47340ba0afd..01639a1d212 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowPort.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowPort.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowProperty.xwt
index 9835b637ce4..80a5ab199e8 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowProperty.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowProperty.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets.layout">

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

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowSpecification.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowSpecification.xwt
index a649d7873d6..a3ca30670e2 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowSpecification.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleFlowSpecification.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleItemFlow.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleItemFlow.xwt
index fa019af2baf..2c9d6c10fa8 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleItemFlow.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleItemFlow.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets">

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNestedConnectorEnd.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNestedConnectorEnd.xwt
index b470b322b84..9a5bb44b83e 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNestedConnectorEnd.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNestedConnectorEnd.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNoBuffer.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNoBuffer.xwt
index 031f0b5c577..a6830dd3f4a 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNoBuffer.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleNoBuffer.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

+<Composite 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:x="http://www.eclipse.org/xwt"

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

 	<Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOptional.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOptional.xwt
index 07141f094b9..90d5a3c6377 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOptional.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOptional.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOverwrite.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOverwrite.xwt
index 41617998b88..719c83afc11 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOverwrite.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleOverwrite.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleParticipantProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleParticipantProperty.xwt
index 32c4cdd0706..892f0f72029 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleParticipantProperty.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleParticipantProperty.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleProbability.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleProbability.xwt
index c6acfdd7f1d..89a99429340 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleProbability.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleProbability.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultiplePropertySpecificType.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultiplePropertySpecificType.xwt
index 89349a5d093..1413a58ba10 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultiplePropertySpecificType.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultiplePropertySpecificType.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

+	xmlns: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.properties.widgets.layout">

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRate.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRate.xwt
index 7cbe31e8e16..f5466f3cb7a 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRate.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRate.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirement.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirement.xwt
index 04e5db3e0d2..65876eeee2d 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirement.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirement.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirementRelated.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirementRelated.xwt
index 48b84296427..e56231bd179 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirementRelated.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleRequirementRelated.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleTestCase.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleTestCase.xwt
index 7da1e49bf84..a63644651dd 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleTestCase.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleTestCase.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleUnit.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleUnit.xwt
index 1953b915ddd..46084197032 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleUnit.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleUnit.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleValueType.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleValueType.xwt
index 751f450ae95..6eff6cbdf17 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleValueType.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleValueType.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleView.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleView.xwt
index c8b5efe2475..d479b3a31b3 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleView.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleView.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets.layout">

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

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleViewPoint.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleViewPoint.xwt
index 67026a5d5f2..de8d9e0da5c 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleViewPoint.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/MultipleViewPoint.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocate.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocate.xwt
index a165997fbcc..4a73f15a9e3 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocate.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocate.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocateActivityPartition.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocateActivityPartition.xwt
index 54363c681db..ae15b4ba255 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocateActivityPartition.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocateActivityPartition.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocated.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocated.xwt
index 3d9ee8cf578..9a32eebadc2 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocated.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleAllocated.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets.layout"

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBindingConnector.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBindingConnector.xwt
index 87bdf4131e9..ea5f0ad12ea 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBindingConnector.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBindingConnector.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets">

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBlock.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBlock.xwt
index 5f66834646c..90b5c595a02 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBlock.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleBlock.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConform.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConform.xwt
index 933290b80b7..4b07b00c769 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConform.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConform.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets"

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConnectorProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConnectorProperty.xwt
index 12ef68621d3..17bc7e07dc9 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConnectorProperty.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConnectorProperty.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintBlock.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintBlock.xwt
index c0d24e6d2d8..b2812502c75 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintBlock.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintBlock.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintProperty.xwt
index 2e2f6e5c719..706858cd9f8 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintProperty.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleConstraintProperty.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleContinuous.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleContinuous.xwt
index 7a5a26d34a4..01484477280 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleContinuous.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleContinuous.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets" xmlns="http://www.eclipse.org/xwt/presentation">

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleControlOperator.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleControlOperator.xwt
index aae6c3ba939..6dbd3ed9288 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleControlOperator.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleControlOperator.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDimension.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDimension.xwt
index fbd33ba895c..5bfc72efafc 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDimension.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDimension.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDiscrete.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDiscrete.xwt
index a8d6fd46cd4..3e168b17181 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDiscrete.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDiscrete.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDistributedProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDistributedProperty.xwt
index 88886d0e13b..7daaa56185f 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDistributedProperty.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleDistributedProperty.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowPort.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowPort.xwt
index 38ccca2e5e1..4b473156ed8 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowPort.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowPort.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowProperty.xwt
index 7b7622d1f8f..f5702f2fae3 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowProperty.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowProperty.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowSpecification.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowSpecification.xwt
index 8d4f22511da..01163f7181d 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowSpecification.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleFlowSpecification.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleItemFlow.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleItemFlow.xwt
index 177fe841fc0..53248f85b6b 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleItemFlow.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleItemFlow.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNestedConnectorEnd.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNestedConnectorEnd.xwt
index 964522d72a9..a5687c3f758 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNestedConnectorEnd.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNestedConnectorEnd.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNoBuffer.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNoBuffer.xwt
index 1c77260f9d1..66c5fd8a18f 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNoBuffer.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleNoBuffer.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

+	xmlns: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.properties.widgets.layout">

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOptional.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOptional.xwt
index 039c8c9909c..5d6fae79ec3 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOptional.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOptional.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOverwrite.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOverwrite.xwt
index 20bd8a95c75..3dd6799d49e 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOverwrite.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleOverwrite.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleParticipantProperty.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleParticipantProperty.xwt
index 856c72f310f..3a11bebc470 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleParticipantProperty.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleParticipantProperty.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleProbability.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleProbability.xwt
index cb553fbdb73..dddc59affeb 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleProbability.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleProbability.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SinglePropertySpecificType.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SinglePropertySpecificType.xwt
index d39d62643e3..e787772d786 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SinglePropertySpecificType.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SinglePropertySpecificType.xwt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRate.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRate.xwt
index 99455ef0b32..812e77848e3 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRate.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRate.xwt
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

+	xmlns: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.properties.widgets">

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirement.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirement.xwt
index 40fe7add249..12c029dc087 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirement.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirement.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirementRelated.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirementRelated.xwt
index a9b1f9ca099..5edfff97d0b 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirementRelated.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleRequirementRelated.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

+<Composite 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.properties.widgets">

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleTestCase.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleTestCase.xwt
index 36019aac03c..36992f18234 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleTestCase.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleTestCase.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleUnit.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleUnit.xwt
index 408cd8e7dbe..37d172d7d84 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleUnit.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleUnit.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleValueType.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleValueType.xwt
index 91b6463b027..db6c95ad4a0 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleValueType.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleValueType.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleView.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleView.xwt
index 7ac30297edf..6168f5e3ea1 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleView.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleView.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

+	xmlns: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">

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleViewPoint.xwt b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleViewPoint.xwt
index 225b23c089e..b2c49a43066 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleViewPoint.xwt
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/Model/ui/SingleViewPoint.xwt
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

 	<Composite.layout>

 		<ppel:PropertiesLayout></ppel:PropertiesLayout>

 	</Composite.layout>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/OSGI-INF/l10n/bundle.properties b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/OSGI-INF/l10n/bundle.properties
index ca2955b534e..a64e20dd88c 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/OSGI-INF/l10n/bundle.properties
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.papyrus.properties.sysml

+#Properties file for org.eclipse.papyrus.sysml.properties

 Bundle-Name = Papyrus properties SysML (Incubation)

 Bundle-Vendor = Eclipse Modeling Project
\ No newline at end of file
diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.xml b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.xml
index 3b25167ac85..2dcde4b7ab9 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.xml
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/plugin.xml
@@ -2,7 +2,7 @@
 <?eclipse version="3.4"?>

 <plugin>

    <extension

-         point="org.eclipse.papyrus.properties.context">

+         point="org.eclipse.papyrus.views.properties.context">

       <context

             contextModel="Model/SysML.ctx">

       </context>

diff --git a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/properties/sysml/Activator.java b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/sysml/properties/Activator.java
index 641b9bdaf15..0c617978f33 100644
--- a/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/properties/sysml/Activator.java
+++ b/plugins/sysml/properties/org.eclipse.papyrus.sysml.properties/src/org/eclipse/papyrus/sysml/properties/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:

  *  Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation

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

-package org.eclipse.papyrus.properties.sysml;

+package org.eclipse.papyrus.sysml.properties;

 

 import org.osgi.framework.BundleActivator;

 import org.osgi.framework.BundleContext;