Synchonizing tests

35 files changed, 358 insertions, 194 deletions

diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/.classpath b/tests/org.eclipse.emf.eef.tests.nonreg.junit/.classpath
index 4c268c256..ce3d60439 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/.classpath
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.eef.tests.nonreg.junit/META-INF/MANIFEST.MF
index 37d8a656e..a099f29b8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Require-Bundle: org.eclipse.emf.eef.runtime.tests,
  org.eclipse.emf.eef.runtime,
  org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.emf.eef.tests.nonreg.edit;bundle-version="1.0.0"
+ org.eclipse.emf.eef.tests.nonreg.edit,
+ org.junit4
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedEObjectFlatComboViewerSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedEObjectFlatComboViewerSampleTestCase.java
index 04da08ee3..c40339c6f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedEObjectFlatComboViewerSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedEObjectFlatComboViewerSampleTestCase.java
@@ -166,7 +166,7 @@ public class AdvancedEObjectFlatComboViewerSampleTestCase extends SWTBotEEFTestC
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, advancedEObjectFlatComboViewerSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerRequiredProperty feature of the AdvancedEObjectFlatComboViewerSample element 
-				bot.editAdvancedEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerRequiredProperty, referenceValueForAdvancedeobjectflatcomboviewerRequiredProperty);
+				bot.editAdvancedEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty, referenceValueForAdvancedeobjectflatcomboviewerRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -227,7 +227,7 @@ public class AdvancedEObjectFlatComboViewerSampleTestCase extends SWTBotEEFTestC
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, advancedEObjectFlatComboViewerSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerRequiredProperty feature of the AdvancedEObjectFlatComboViewerSample element 
-				bot.removeAdvancedEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerRequiredProperty);
+				bot.removeAdvancedEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -289,7 +289,7 @@ public class AdvancedEObjectFlatComboViewerSampleTestCase extends SWTBotEEFTestC
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, advancedEObjectFlatComboViewerSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerOptionalProperty feature of the AdvancedEObjectFlatComboViewerSample element 
-				bot.editAdvancedEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerOptionalProperty, referenceValueForAdvancedeobjectflatcomboviewerOptionalProperty);
+				bot.editAdvancedEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty, referenceValueForAdvancedeobjectflatcomboviewerOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -350,7 +350,7 @@ public class AdvancedEObjectFlatComboViewerSampleTestCase extends SWTBotEEFTestC
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, advancedEObjectFlatComboViewerSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerOptionalProperty feature of the AdvancedEObjectFlatComboViewerSample element 
-				bot.removeAdvancedEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerOptionalProperty);
+				bot.removeAdvancedEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedReferencesTableSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedReferencesTableSampleTestCase.java
index 6cd033862..997393acc 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedReferencesTableSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedReferencesTableSampleTestCase.java
@@ -168,7 +168,7 @@ public class AdvancedReferencesTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, advancedReferencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableRequiredProperty feature of the AdvancedReferencesTableSample element 
-		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableRequiredProperty, referenceValueForAdvancedreferencestableRequiredProperty);
+		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty, referenceValueForAdvancedreferencestableRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -234,7 +234,7 @@ public class AdvancedReferencesTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, advancedReferencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableRequiredProperty feature of the AdvancedReferencesTableSample element 
-		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
+		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -296,7 +296,7 @@ public class AdvancedReferencesTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, advancedReferencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableOptionalProperty feature of the AdvancedReferencesTableSample element 
-		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableOptionalProperty, referenceValueForAdvancedreferencestableOptionalProperty);
+		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty, referenceValueForAdvancedreferencestableOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -362,7 +362,7 @@ public class AdvancedReferencesTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, advancedReferencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableOptionalProperty feature of the AdvancedReferencesTableSample element 
-		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
+		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedTableCompositionEditorSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedTableCompositionEditorSampleTestCase.java
index 63f4fcf0f..a9883260f 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedTableCompositionEditorSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/AdvancedTableCompositionEditorSampleTestCase.java
@@ -227,7 +227,7 @@ public class AdvancedTableCompositionEditorSampleTestCase extends SWTBotEEFTestC
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, advancedTableCompositionEditorSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedtablecompositionRequiredProperty feature of the AdvancedTableCompositionEditorSample element 
-				bot.removeAdvancedTableCompositionFeature(wizardShell, EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionRequiredProperty);
+				bot.removeAdvancedTableCompositionFeature(wizardShell, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -355,7 +355,7 @@ public class AdvancedTableCompositionEditorSampleTestCase extends SWTBotEEFTestC
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, advancedTableCompositionEditorSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedtablecompositionOptionalProperty feature of the AdvancedTableCompositionEditorSample element 
-				bot.removeAdvancedTableCompositionFeature(wizardShell, EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionOptionalProperty);
+				bot.removeAdvancedTableCompositionFeature(wizardShell, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -376,9 +376,9 @@ public class AdvancedTableCompositionEditorSampleTestCase extends SWTBotEEFTestC
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -387,7 +387,7 @@ public class AdvancedTableCompositionEditorSampleTestCase extends SWTBotEEFTestC
 	 */
 	protected void editAdvancedTableCompositionadvancedtablecompositionRequiredPropertyFeature(SWTBotShell wizardShell) throws WidgetInvalidException {
 		bot.activateShell(wizardShell);
-		bot.addButtonAdvancedTableComposition(EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionRequiredProperty).click();
+		bot.addButtonAdvancedTableComposition(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty).click();
 		editAdvancedTableCompositionForadvancedtablecompositionRequiredPropertyFeature();
 		bot.closeShellWithFinishButton(wizardShell);
 	}
@@ -400,9 +400,9 @@ public class AdvancedTableCompositionEditorSampleTestCase extends SWTBotEEFTestC
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -411,7 +411,7 @@ public class AdvancedTableCompositionEditorSampleTestCase extends SWTBotEEFTestC
 	 */
 	protected void editAdvancedTableCompositionadvancedtablecompositionOptionalPropertyFeature(SWTBotShell wizardShell) throws WidgetInvalidException {
 		bot.activateShell(wizardShell);
-		bot.addButtonAdvancedTableComposition(EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionOptionalProperty).click();
+		bot.addButtonAdvancedTableComposition(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty).click();
 		editAdvancedTableCompositionForadvancedtablecompositionOptionalPropertyFeature();
 		bot.closeShellWithFinishButton(wizardShell);
 	}
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/CheckboxSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/CheckboxSampleTestCase.java
index 2928dd60b..32778a9bb 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/CheckboxSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/CheckboxSampleTestCase.java
@@ -147,7 +147,7 @@ public class CheckboxSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, checkboxSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the checkboxRequiredProperty feature of the CheckboxSample element 
-				bot.editCheckboxFeature(wizardShell, EefnrViewsRepository.CheckboxSample.checkboxRequiredProperty);
+				bot.editCheckboxFeature(wizardShell, EefnrViewsRepository.CheckboxSample.Properties.checkboxRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -208,7 +208,7 @@ public class CheckboxSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, checkboxSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the checkboxOptionalProperty feature of the CheckboxSample element 
-				bot.editCheckboxFeature(wizardShell, EefnrViewsRepository.CheckboxSample.checkboxOptionalProperty);
+				bot.editCheckboxFeature(wizardShell, EefnrViewsRepository.CheckboxSample.Properties.checkboxOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/EMFComboViewerSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/EMFComboViewerSampleTestCase.java
index a0eb21d74..ef7ec9f41 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/EMFComboViewerSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/EMFComboViewerSampleTestCase.java
@@ -156,7 +156,7 @@ public class EMFComboViewerSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, eMFComboViewerSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the emfcomboviewerRequiredProperty feature of the EMFComboViewerSample element 
-				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.EMFComboViewerSample.emfcomboviewerRequiredProperty, enumValueForEmfcomboviewerRequiredProperty);
+				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty, enumValueForEmfcomboviewerRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -217,7 +217,7 @@ public class EMFComboViewerSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, eMFComboViewerSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the emfcomboviewerOptionalProperty feature of the EMFComboViewerSample element 
-				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.EMFComboViewerSample.emfcomboviewerOptionalProperty, enumValueForEmfcomboviewerOptionalProperty);
+				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerOptionalProperty, enumValueForEmfcomboviewerOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/EObjectFlatComboViewerSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/EObjectFlatComboViewerSampleTestCase.java
index 8db3beb1d..9e523b352 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/EObjectFlatComboViewerSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/EObjectFlatComboViewerSampleTestCase.java
@@ -166,7 +166,7 @@ public class EObjectFlatComboViewerSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, eObjectFlatComboViewerSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerRequiredPropery feature of the EObjectFlatComboViewerSample element 
-		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerRequiredPropery, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerRequiredPropery));
+		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerRequiredPropery));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -228,7 +228,7 @@ public class EObjectFlatComboViewerSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, eObjectFlatComboViewerSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerOptionalPropery feature of the EObjectFlatComboViewerSample element 
-		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerOptionalPropery, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerOptionalPropery)+1);
+		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerOptionalPropery)+1);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -289,7 +289,7 @@ public class EObjectFlatComboViewerSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, eObjectFlatComboViewerSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerOptionalPropery feature of the EObjectFlatComboViewerSample element
-		bot.removeEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerOptionalPropery);
+		bot.removeEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery);
 		
 		
 		// Save the changement
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/FlatReferenceTableSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/FlatReferenceTableSampleTestCase.java
index 63b5b6ae0..ae7471b73 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/FlatReferenceTableSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/FlatReferenceTableSampleTestCase.java
@@ -167,7 +167,7 @@ public class FlatReferenceTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, flatReferencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the flatreferencetableRequiredProperty feature of the FlatReferencesTableSample element 
-		bot.editFlatReferencesTableFeature(wizardShell, EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableRequiredProperty, 0);
+		bot.editFlatReferencesTableFeature(wizardShell, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty, 0);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -233,7 +233,7 @@ public class FlatReferenceTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, flatReferencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the flatreferencetableRequiredProperty feature of the FlatReferencesTableSample element
-				bot.removeFlatReferencesTableFeature(wizardShell, EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableRequiredProperty);
+				bot.removeFlatReferencesTableFeature(wizardShell, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -295,7 +295,7 @@ public class FlatReferenceTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, flatReferencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the flatreferencetableOptionalProperty feature of the FlatReferencesTableSample element 
-		bot.editFlatReferencesTableFeature(wizardShell, EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableOptionalProperty, 0);
+		bot.editFlatReferencesTableFeature(wizardShell, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty, 0);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -361,7 +361,7 @@ public class FlatReferenceTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, flatReferencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the flatreferencetableOptionalProperty feature of the FlatReferencesTableSample element
-				bot.removeFlatReferencesTableFeature(wizardShell, EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableOptionalProperty);
+				bot.removeFlatReferencesTableFeature(wizardShell, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/MultiValuedEditorSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/MultiValuedEditorSampleTestCase.java
index 25473a0dd..396326fa2 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/MultiValuedEditorSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/MultiValuedEditorSampleTestCase.java
@@ -150,7 +150,7 @@ public class MultiValuedEditorSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, multiValuedEditorSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the multivaluededitorRequiredProperty feature of the MultiValuedEditorSample element 
-				bot.editMultiValuedEditorFeature(wizardShell, EefnrViewsRepository.MultiValuedEditorSample.multivaluededitorRequiredProperty, UPDATED_VALUE);
+				bot.editMultiValuedEditorFeature(wizardShell, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorRequiredProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -212,7 +212,7 @@ public class MultiValuedEditorSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, multiValuedEditorSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the multivaluededitorOptionalProperty feature of the MultiValuedEditorSample element 
-				bot.editMultiValuedEditorFeature(wizardShell, EefnrViewsRepository.MultiValuedEditorSample.multivaluededitorOptionalProperty, UPDATED_VALUE);
+				bot.editMultiValuedEditorFeature(wizardShell, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorOptionalProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/RadioSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/RadioSampleTestCase.java
index d2f1f66a0..8daca8cd9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/RadioSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/RadioSampleTestCase.java
@@ -156,7 +156,7 @@ public class RadioSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, radioSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the radioRequiredProperty feature of the RadioSample element 
-				bot.editRadioFeature(wizardShell, EefnrViewsRepository.RadioSample.radioRequiredProperty, enumValueForRadioRequiredProperty);
+				bot.editRadioFeature(wizardShell, EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty, enumValueForRadioRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -217,7 +217,7 @@ public class RadioSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, radioSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the radioOptionalProperty feature of the RadioSample element 
-				bot.editRadioFeature(wizardShell, EefnrViewsRepository.RadioSample.radioOptionalProperty, enumValueForRadioOptionalProperty);
+				bot.editRadioFeature(wizardShell, EefnrViewsRepository.RadioSample.Properties.radioOptionalProperty, enumValueForRadioOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/ReferencesTableSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/ReferencesTableSampleTestCase.java
index 3c29f594c..29afe111e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/ReferencesTableSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/ReferencesTableSampleTestCase.java
@@ -167,7 +167,7 @@ public class ReferencesTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, referencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableRequiredProperty feature of the ReferencesTableSample element 
-				bot.editReferencesTableFeature(wizardShell, EefnrViewsRepository.ReferencesTableSample.referencestableRequiredProperty, 0);
+				bot.editReferencesTableFeature(wizardShell, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableRequiredProperty, 0);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -233,7 +233,7 @@ public class ReferencesTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, referencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableRequiredProperty feature of the ReferencesTableSample element 
-				bot.removeReferencesTableFeature(wizardShell, EefnrViewsRepository.ReferencesTableSample.referencestableRequiredProperty, 0);
+				bot.removeReferencesTableFeature(wizardShell, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableRequiredProperty, 0);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -295,7 +295,7 @@ public class ReferencesTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, referencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableOptionalProperty feature of the ReferencesTableSample element 
-				bot.editReferencesTableFeature(wizardShell, EefnrViewsRepository.ReferencesTableSample.referencestableOptionalProperty, 0);
+				bot.editReferencesTableFeature(wizardShell, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableOptionalProperty, 0);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -361,7 +361,7 @@ public class ReferencesTableSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, referencesTableSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableOptionalProperty feature of the ReferencesTableSample element 
-				bot.removeReferencesTableFeature(wizardShell, EefnrViewsRepository.ReferencesTableSample.referencestableOptionalProperty, 0);
+				bot.removeReferencesTableFeature(wizardShell, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableOptionalProperty, 0);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/SampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/SampleTestCase.java
index ed479246a..2d8b856ce 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/SampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/SampleTestCase.java
@@ -146,7 +146,7 @@ public class SampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, sampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the textRequiredProperty feature of the Sample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.Sample.textRequiredProperty, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.Sample.Properties.textRequiredProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -206,7 +206,7 @@ public class SampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, sampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the textOptionalProperty feature of the Sample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.Sample.textOptionalProperty, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.Sample.Properties.textOptionalProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TableCompositionEditorSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TableCompositionEditorSampleTestCase.java
index 4463f7a2b..153efada5 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TableCompositionEditorSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TableCompositionEditorSampleTestCase.java
@@ -226,7 +226,7 @@ public class TableCompositionEditorSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, tableCompositionEditorSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the tablecompositionRequiredProperty feature of the TableCompositionEditorSample element 
-		bot.removeTableCompositionFeature(wizardShell, EefnrViewsRepository.TableCompositionEditorSample.tablecompositionRequiredProperty);
+		bot.removeTableCompositionFeature(wizardShell, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -352,7 +352,7 @@ public class TableCompositionEditorSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, tableCompositionEditorSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the tablecompositionOptionalProperty feature of the TableCompositionEditorSample element 
-		bot.removeTableCompositionFeature(wizardShell, EefnrViewsRepository.TableCompositionEditorSample.tablecompositionOptionalProperty);
+		bot.removeTableCompositionFeature(wizardShell, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -373,9 +373,9 @@ public class TableCompositionEditorSampleTestCase extends SWTBotEEFTestCase {
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -384,7 +384,7 @@ public class TableCompositionEditorSampleTestCase extends SWTBotEEFTestCase {
 	 */
 	protected void editTableCompositiontablecompositionRequiredPropertyFeature(SWTBotShell wizardShell) throws WidgetInvalidException{
 		bot.activateShell(wizardShell);
-		bot.addButtonTableComposition(EefnrViewsRepository.TableCompositionEditorSample.tablecompositionRequiredProperty).click();
+		bot.addButtonTableComposition(EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty).click();
 		editTableCompositionFortablecompositionRequiredPropertyFeature();
 		bot.closeShellWithFinishButton(wizardShell);
 	}
@@ -397,9 +397,9 @@ public class TableCompositionEditorSampleTestCase extends SWTBotEEFTestCase {
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -408,7 +408,7 @@ public class TableCompositionEditorSampleTestCase extends SWTBotEEFTestCase {
 	 */
 	protected void editTableCompositiontablecompositionOptionalPropertyFeature(SWTBotShell wizardShell) throws WidgetInvalidException{
 		bot.activateShell(wizardShell);
-		bot.addButtonTableComposition(EefnrViewsRepository.TableCompositionEditorSample.tablecompositionOptionalProperty).click();
+		bot.addButtonTableComposition(EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty).click();
 		editTableCompositionFortablecompositionOptionalPropertyFeature();
 		bot.closeShellWithFinishButton(wizardShell);
 	}
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextSampleTestCase.java
index 57c587f57..a9dbc2c3e 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextSampleTestCase.java
@@ -148,7 +148,7 @@ public class TextSampleTestCase extends SWTBotEEFTestCase {
 		
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, textSampleMetaClass, firstInstanceOf, "Base");
 		// Change value of the textRequiredProperty feature of the TextSample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSample.textRequiredProperty, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSample.Properties.textRequiredProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -208,7 +208,7 @@ public class TextSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, textSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the textOptionalProperty feature of the TextSample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSample.textOptionalProperty, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSample.Properties.textOptionalProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextSampleWithTwoTabsTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextSampleWithTwoTabsTestCase.java
index c7f17a135..d8bfe93ce 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextSampleWithTwoTabsTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextSampleWithTwoTabsTestCase.java
@@ -146,7 +146,7 @@ public class TextSampleWithTwoTabsTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, textSampleWithTwoTabsMetaClass, firstInstanceOf, "TextSampleFirstTab");
 		
 		// Change value of the textOptionalPropertyInFirstTab feature of the TextSampleWithTwoTabs element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSampleFirstTab.textOptionalPropertyInFirstTab, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -206,7 +206,7 @@ public class TextSampleWithTwoTabsTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, textSampleWithTwoTabsMetaClass, firstInstanceOf, "TextSampleFirstTab");
 		
 		// Change value of the textRequiredPropertyInFirstTab feature of the TextSampleWithTwoTabs element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSampleFirstTab.textRequiredPropertyInFirstTab, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -266,7 +266,7 @@ public class TextSampleWithTwoTabsTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, textSampleWithTwoTabsMetaClass, firstInstanceOf, "TextSampleSecondTab");
 		
 		// Change value of the textOptionalPropertyInSecondTab feature of the TextSampleWithTwoTabs element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSampleSecondTab.textOptionalPropertyInSecondTab, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -326,7 +326,7 @@ public class TextSampleWithTwoTabsTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, textSampleWithTwoTabsMetaClass, firstInstanceOf, "TextSampleSecondTab");
 		
 		// Change value of the textRequiredPropertyInSecondTab feature of the TextSampleWithTwoTabs element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSampleSecondTab.textRequiredPropertyInSecondTab, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextareaSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextareaSampleTestCase.java
index dfc7b7775..5cd522cb4 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextareaSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TextareaSampleTestCase.java
@@ -146,7 +146,7 @@ public class TextareaSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, textareaSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the textareaRequiredProperty feature of the TextareaSample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextareaSample.textareaRequiredProperty, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -206,7 +206,7 @@ public class TextareaSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, textareaSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the textareaOptionalProperty feature of the TextareaSample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextareaSample.textareaOptionalProperty, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TextareaSample.Properties.textareaOptionalProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TotalSampleTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TotalSampleTestCase.java
index 3b95c92c8..5f8e394e7 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TotalSampleTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/TotalSampleTestCase.java
@@ -211,7 +211,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the textRequiredProperty feature of the TotalSample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TotalSample.textRequiredProperty, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.textRequiredProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -271,7 +271,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the textOptionalProperty feature of the TotalSample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TotalSample.textOptionalProperty, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.textOptionalProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -332,7 +332,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the checkboxRequiredProperty feature of the TotalSample element 
-				bot.editCheckboxFeature(wizardShell, EefnrViewsRepository.TotalSample.checkboxRequiredProperty);
+				bot.editCheckboxFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.checkboxRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -393,7 +393,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the checkboxOptionalProperty feature of the TotalSample element 
-				bot.editCheckboxFeature(wizardShell, EefnrViewsRepository.TotalSample.checkboxOptionalProperty);
+				bot.editCheckboxFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.checkboxOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -453,7 +453,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the textareaRequiredProperty feature of the TotalSample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TotalSample.textareaRequiredProperty, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -513,7 +513,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the textareaOptionalProperty feature of the TotalSample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TotalSample.textareaOptionalProperty, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.textareaOptionalProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -574,7 +574,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the radioRequiredProperty feature of the TotalSample element 
-				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.radioRequiredProperty, enumValueForRadioRequiredProperty);
+				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty, enumValueForRadioRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -635,7 +635,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the radioOptionalProperty feature of the TotalSample element 
-				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.radioOptionalProperty, enumValueForRadioOptionalProperty);
+				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty, enumValueForRadioOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -697,7 +697,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerRequiredProperty feature of the TotalSample element 
-		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.eobjectflatcomboviewerRequiredProperty, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerRequiredProperty));
+		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerRequiredProperty));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -759,7 +759,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerOptionalProperty feature of the TotalSample element 
-		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.eobjectflatcomboviewerOptionalProperty, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerOptionalProperty)+1);
+		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerOptionalProperty)+1);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -820,7 +820,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerOptionalProperty feature of the TotalSample element
-		bot.removeEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.eobjectflatcomboviewerOptionalProperty);
+		bot.removeEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty);
 		
 		
 		// Save the changement
@@ -883,7 +883,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableRequiredProperty feature of the TotalSample element 
-		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.referencestableRequiredProperty, referenceValueForReferencestableRequiredProperty);
+		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty, referenceValueForReferencestableRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -949,7 +949,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableRequiredProperty feature of the TotalSample element 
-		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.referencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
+		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1011,7 +1011,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableOptionalProperty feature of the TotalSample element 
-		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.referencestableOptionalProperty, referenceValueForReferencestableOptionalProperty);
+		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty, referenceValueForReferencestableOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1077,7 +1077,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableOptionalProperty feature of the TotalSample element 
-		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.referencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
+		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1138,7 +1138,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the emfcomboviewerRequiredProperty feature of the TotalSample element 
-				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.emfcomboviewerRequiredProperty, enumValueForEmfcomboviewerRequiredProperty);
+				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty, enumValueForEmfcomboviewerRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1199,7 +1199,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the emfcomboviewerOptionalProperty feature of the TotalSample element 
-				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.emfcomboviewerOptionalProperty, enumValueForEmfcomboviewerOptionalProperty);
+				bot.editEMFComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty, enumValueForEmfcomboviewerOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1261,7 +1261,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the multivaluededitorRequiredProperty feature of the TotalSample element 
-				bot.editMultiValuedEditorFeature(wizardShell, EefnrViewsRepository.TotalSample.multivaluededitorRequiredProperty, UPDATED_VALUE);
+				bot.editMultiValuedEditorFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.multivaluededitorRequiredProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1323,7 +1323,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the multivaluededitorOptionalProperty feature of the TotalSample element 
-				bot.editMultiValuedEditorFeature(wizardShell, EefnrViewsRepository.TotalSample.multivaluededitorOptionalProperty, UPDATED_VALUE);
+				bot.editMultiValuedEditorFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.multivaluededitorOptionalProperty, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1449,7 +1449,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the tablecompositionRequiredProperty feature of the TotalSample element 
-		bot.removeTableCompositionFeature(wizardShell, EefnrViewsRepository.TotalSample.tablecompositionRequiredProperty);
+		bot.removeTableCompositionFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1575,7 +1575,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the tablecompositionOptionalProperty feature of the TotalSample element 
-		bot.removeTableCompositionFeature(wizardShell, EefnrViewsRepository.TotalSample.tablecompositionOptionalProperty);
+		bot.removeTableCompositionFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1637,7 +1637,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableRequiredProperty feature of the TotalSample element 
-		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.advancedreferencestableRequiredProperty, referenceValueForAdvancedreferencestableRequiredProperty);
+		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty, referenceValueForAdvancedreferencestableRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1703,7 +1703,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableRequiredProperty feature of the TotalSample element 
-		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.advancedreferencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
+		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1765,7 +1765,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableOptionalProperty feature of the TotalSample element 
-		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.advancedreferencestableOptionalProperty, referenceValueForAdvancedreferencestableOptionalProperty);
+		bot.editAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty, referenceValueForAdvancedreferencestableOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1831,7 +1831,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableOptionalProperty feature of the TotalSample element 
-		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.advancedreferencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
+		bot.removeAdvancedReferencesTableFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1893,7 +1893,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerRequiredPropery feature of the TotalSample element 
-		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerRequiredPropery, allInstancesOf.indexOf(referenceValueForAdvancedeobjectflatcomboviewerRequiredPropery));
+		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery, allInstancesOf.indexOf(referenceValueForAdvancedeobjectflatcomboviewerRequiredPropery));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1955,7 +1955,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerOptionalPropery feature of the TotalSample element 
-		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerOptionalPropery, allInstancesOf.indexOf(referenceValueForAdvancedeobjectflatcomboviewerOptionalPropery)+1);
+		bot.editEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery, allInstancesOf.indexOf(referenceValueForAdvancedeobjectflatcomboviewerOptionalPropery)+1);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -2016,7 +2016,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerOptionalPropery feature of the TotalSample element
-		bot.removeEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerOptionalPropery);
+		bot.removeEObjectFlatComboViewerFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery);
 		
 		
 		// Save the changement
@@ -2145,7 +2145,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedtablecompositionRequiredProperty feature of the TotalSample element 
-				bot.removeAdvancedTableCompositionFeature(wizardShell, EefnrViewsRepository.TotalSample.advancedtablecompositionRequiredProperty);
+				bot.removeAdvancedTableCompositionFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -2273,7 +2273,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the advancedtablecompositionOptionalProperty feature of the TotalSample element 
-				bot.removeAdvancedTableCompositionFeature(wizardShell, EefnrViewsRepository.TotalSample.advancedtablecompositionOptionalProperty);
+				bot.removeAdvancedTableCompositionFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -2333,7 +2333,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		SWTBotShell wizardShell = bot.prepareBatchEditing(modelEditor, totalSampleMetaClass, firstInstanceOf, "Base");
 		
 		// Change value of the name feature of the TotalSample element 
-				bot.editTextFeature(wizardShell, EefnrViewsRepository.TotalSample.name, UPDATED_VALUE);
+				bot.editTextFeature(wizardShell, EefnrViewsRepository.TotalSample.Properties.name, UPDATED_VALUE);
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -2386,9 +2386,9 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -2397,7 +2397,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 	 */
 	protected void editTableCompositiontablecompositionRequiredPropertyFeature(SWTBotShell wizardShell) throws WidgetInvalidException{
 		bot.activateShell(wizardShell);
-		bot.addButtonTableComposition(EefnrViewsRepository.TotalSample.tablecompositionRequiredProperty).click();
+		bot.addButtonTableComposition(EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty).click();
 		editTableCompositionFortablecompositionRequiredPropertyFeature();
 		bot.closeShellWithFinishButton(wizardShell);
 	}
@@ -2410,9 +2410,9 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -2421,7 +2421,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 	 */
 	protected void editTableCompositiontablecompositionOptionalPropertyFeature(SWTBotShell wizardShell) throws WidgetInvalidException{
 		bot.activateShell(wizardShell);
-		bot.addButtonTableComposition(EefnrViewsRepository.TotalSample.tablecompositionOptionalProperty).click();
+		bot.addButtonTableComposition(EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty).click();
 		editTableCompositionFortablecompositionOptionalPropertyFeature();
 		bot.closeShellWithFinishButton(wizardShell);
 	}
@@ -2442,9 +2442,9 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -2453,7 +2453,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 	 */
 	protected void editAdvancedTableCompositionadvancedtablecompositionRequiredPropertyFeature(SWTBotShell wizardShell) throws WidgetInvalidException {
 		bot.activateShell(wizardShell);
-		bot.addButtonAdvancedTableComposition(EefnrViewsRepository.TotalSample.advancedtablecompositionRequiredProperty).click();
+		bot.addButtonAdvancedTableComposition(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty).click();
 		editAdvancedTableCompositionForadvancedtablecompositionRequiredPropertyFeature();
 		bot.closeShellWithFinishButton(wizardShell);
 	}
@@ -2466,9 +2466,9 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -2477,7 +2477,7 @@ public class TotalSampleTestCase extends SWTBotEEFTestCase {
 	 */
 	protected void editAdvancedTableCompositionadvancedtablecompositionOptionalPropertyFeature(SWTBotShell wizardShell) throws WidgetInvalidException {
 		bot.activateShell(wizardShell);
-		bot.addButtonAdvancedTableComposition(EefnrViewsRepository.TotalSample.advancedtablecompositionOptionalProperty).click();
+		bot.addButtonAdvancedTableComposition(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty).click();
 		editAdvancedTableCompositionForadvancedtablecompositionOptionalPropertyFeature();
 		bot.closeShellWithFinishButton(wizardShell);
 	}
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedEObjectFlatComboViewerSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedEObjectFlatComboViewerSamplePropertiesTestCase.java
index e68b19863..a15bb2d34 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedEObjectFlatComboViewerSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedEObjectFlatComboViewerSamplePropertiesTestCase.java
@@ -166,7 +166,7 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesTestCase extends SWTB
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerRequiredProperty feature of the AdvancedEObjectFlatComboViewerSample element 
-				bot.editPropertyAdvancedEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerRequiredProperty, referenceValueForAdvancedeobjectflatcomboviewerRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyAdvancedEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty, referenceValueForAdvancedeobjectflatcomboviewerRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -227,7 +227,7 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesTestCase extends SWTB
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerRequiredProperty feature of the AdvancedEObjectFlatComboViewerSample element 
-				bot.removePropertyAdvancedEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.removePropertyAdvancedEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -289,7 +289,7 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesTestCase extends SWTB
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerOptionalProperty feature of the AdvancedEObjectFlatComboViewerSample element 
-				bot.editPropertyAdvancedEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerOptionalProperty, referenceValueForAdvancedeobjectflatcomboviewerOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyAdvancedEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty, referenceValueForAdvancedeobjectflatcomboviewerOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -350,7 +350,7 @@ public class AdvancedEObjectFlatComboViewerSamplePropertiesTestCase extends SWTB
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerOptionalProperty feature of the AdvancedEObjectFlatComboViewerSample element 
-				bot.removePropertyAdvancedEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.advancedeobjectflatcomboviewerOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.removePropertyAdvancedEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.AdvancedEObjectFlatComboViewerSample.Properties.advancedeobjectflatcomboviewerOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedReferencesTableSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedReferencesTableSamplePropertiesTestCase.java
index 4a65b9b82..1fb1ca7b1 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedReferencesTableSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedReferencesTableSamplePropertiesTestCase.java
@@ -168,7 +168,7 @@ public class AdvancedReferencesTableSamplePropertiesTestCase extends SWTBotEEFTe
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableRequiredProperty feature of the AdvancedReferencesTableSample element 
-		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableRequiredProperty, referenceValueForAdvancedreferencestableRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty, referenceValueForAdvancedreferencestableRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -234,7 +234,7 @@ public class AdvancedReferencesTableSamplePropertiesTestCase extends SWTBotEEFTe
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableRequiredProperty feature of the AdvancedReferencesTableSample element 
-		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -296,7 +296,7 @@ public class AdvancedReferencesTableSamplePropertiesTestCase extends SWTBotEEFTe
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableOptionalProperty feature of the AdvancedReferencesTableSample element 
-		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableOptionalProperty, referenceValueForAdvancedreferencestableOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty, referenceValueForAdvancedreferencestableOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -362,7 +362,7 @@ public class AdvancedReferencesTableSamplePropertiesTestCase extends SWTBotEEFTe
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableOptionalProperty feature of the AdvancedReferencesTableSample element 
-		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.AdvancedReferencesTableSample.advancedreferencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.AdvancedReferencesTableSample.Properties.advancedreferencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedTableCompositionEditorSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedTableCompositionEditorSamplePropertiesTestCase.java
index e11d15757..413061951 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedTableCompositionEditorSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/AdvancedTableCompositionEditorSamplePropertiesTestCase.java
@@ -231,7 +231,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesTestCase extends SWTB
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedtablecompositionRequiredProperty feature of the AdvancedTableCompositionEditorSample element 
-		bot.removePropertyAdvancedTableCompositionFeature(propertiesView, EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyAdvancedTableCompositionFeature(propertiesView, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -359,7 +359,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesTestCase extends SWTB
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedtablecompositionOptionalProperty feature of the AdvancedTableCompositionEditorSample element 
-		bot.removePropertyAdvancedTableCompositionFeature(propertiesView, EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyAdvancedTableCompositionFeature(propertiesView, EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -380,9 +380,9 @@ public class AdvancedTableCompositionEditorSamplePropertiesTestCase extends SWTB
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -391,7 +391,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesTestCase extends SWTB
 	 */
 	protected void editAdvancedTableCompositionadvancedtablecompositionRequiredPropertyFeature(SWTBotView propertyView, SWTBotTreeItem selectNode) throws WidgetInvalidException {
 		SWTEEFBotHelper helper = new SWTEEFBotHelper(propertyView.bot());
-		helper.addButtonAdvancedTableComposition(EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionRequiredProperty).click();
+		helper.addButtonAdvancedTableComposition(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionRequiredProperty).click();
 		editAdvancedTableCompositionForadvancedtablecompositionRequiredPropertyFeature();
 		selectNode.select();
 	}
@@ -404,9 +404,9 @@ public class AdvancedTableCompositionEditorSamplePropertiesTestCase extends SWTB
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -415,7 +415,7 @@ public class AdvancedTableCompositionEditorSamplePropertiesTestCase extends SWTB
 	 */
 	protected void editAdvancedTableCompositionadvancedtablecompositionOptionalPropertyFeature(SWTBotView propertyView, SWTBotTreeItem selectNode) throws WidgetInvalidException {
 		SWTEEFBotHelper helper = new SWTEEFBotHelper(propertyView.bot());
-		helper.addButtonAdvancedTableComposition(EefnrViewsRepository.AdvancedTableCompositionEditorSample.advancedtablecompositionOptionalProperty).click();
+		helper.addButtonAdvancedTableComposition(EefnrViewsRepository.AdvancedTableCompositionEditorSample.Properties.advancedtablecompositionOptionalProperty).click();
 		editAdvancedTableCompositionForadvancedtablecompositionOptionalPropertyFeature();
 		selectNode.select();
 	}
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/CheckboxSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/CheckboxSamplePropertiesTestCase.java
index 53f5729ef..25caf8be9 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/CheckboxSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/CheckboxSamplePropertiesTestCase.java
@@ -147,7 +147,7 @@ public class CheckboxSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the checkboxRequiredProperty feature of the CheckboxSample element 
-				bot.editPropertyEEFCheckbox(propertiesView, EefnrViewsRepository.CheckboxSample.checkboxRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFCheckbox(propertiesView, EefnrViewsRepository.CheckboxSample.Properties.checkboxRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -208,7 +208,7 @@ public class CheckboxSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the checkboxOptionalProperty feature of the CheckboxSample element 
-				bot.editPropertyEEFCheckbox(propertiesView, EefnrViewsRepository.CheckboxSample.checkboxOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFCheckbox(propertiesView, EefnrViewsRepository.CheckboxSample.Properties.checkboxOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/EMFComboViewerSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/EMFComboViewerSamplePropertiesTestCase.java
index bf0945339..ba462d351 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/EMFComboViewerSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/EMFComboViewerSamplePropertiesTestCase.java
@@ -156,7 +156,7 @@ public class EMFComboViewerSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the emfcomboviewerRequiredProperty feature of the EMFComboViewerSample element 
-				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.EMFComboViewerSample.emfcomboviewerRequiredProperty, enumValueForEmfcomboviewerRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerRequiredProperty, enumValueForEmfcomboviewerRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -217,7 +217,7 @@ public class EMFComboViewerSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the emfcomboviewerOptionalProperty feature of the EMFComboViewerSample element 
-				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.EMFComboViewerSample.emfcomboviewerOptionalProperty, enumValueForEmfcomboviewerOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.EMFComboViewerSample.Properties.emfcomboviewerOptionalProperty, enumValueForEmfcomboviewerOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/EObjectFlatComboViewerSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/EObjectFlatComboViewerSamplePropertiesTestCase.java
index d1d129400..589fe8abe 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/EObjectFlatComboViewerSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/EObjectFlatComboViewerSamplePropertiesTestCase.java
@@ -166,7 +166,7 @@ public class EObjectFlatComboViewerSamplePropertiesTestCase extends SWTBotEEFTes
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerRequiredPropery feature of the EObjectFlatComboViewerSample element 
-		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerRequiredPropery, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerRequiredPropery), bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerRequiredPropery, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerRequiredPropery), bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -228,7 +228,7 @@ public class EObjectFlatComboViewerSamplePropertiesTestCase extends SWTBotEEFTes
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerOptionalPropery feature of the EObjectFlatComboViewerSample element 
-		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerOptionalPropery, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerOptionalPropery)+1, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerOptionalPropery)+1, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -289,7 +289,7 @@ public class EObjectFlatComboViewerSamplePropertiesTestCase extends SWTBotEEFTes
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerOptionalPropery feature of the EObjectFlatComboViewerSample element 
-		bot.removePropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.EObjectFlatComboViewerSample.eobjectflatcomboviewerOptionalPropery, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.EObjectFlatComboViewerSample.Properties.eobjectflatcomboviewerOptionalPropery, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		
 		// Save the changement
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/FlatReferenceTableSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/FlatReferenceTableSamplePropertiesTestCase.java
index 8e89146c3..7b150753b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/FlatReferenceTableSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/FlatReferenceTableSamplePropertiesTestCase.java
@@ -167,7 +167,7 @@ public class FlatReferenceTableSamplePropertiesTestCase extends SWTBotEEFTestCas
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the flatreferencetableRequiredProperty feature of the FlatReferencesTableSample element 
-		bot.editPropertyFlatReferencesTableFeature(propertiesView, EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableRequiredProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyFlatReferencesTableFeature(propertiesView, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -233,7 +233,7 @@ public class FlatReferenceTableSamplePropertiesTestCase extends SWTBotEEFTestCas
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the flatreferencetableRequiredProperty feature of the FlatReferencesTableSample element 
-				bot.removePropertyFlatReferencesTableFeature(propertiesView, EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.removePropertyFlatReferencesTableFeature(propertiesView, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -295,7 +295,7 @@ public class FlatReferenceTableSamplePropertiesTestCase extends SWTBotEEFTestCas
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the flatreferencetableOptionalProperty feature of the FlatReferencesTableSample element 
-		bot.editPropertyFlatReferencesTableFeature(propertiesView, EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableOptionalProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyFlatReferencesTableFeature(propertiesView, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -361,7 +361,7 @@ public class FlatReferenceTableSamplePropertiesTestCase extends SWTBotEEFTestCas
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the flatreferencetableOptionalProperty feature of the FlatReferencesTableSample element 
-				bot.removePropertyFlatReferencesTableFeature(propertiesView, EefnrViewsRepository.FlatReferenceTableSample.flatreferencetableOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.removePropertyFlatReferencesTableFeature(propertiesView, EefnrViewsRepository.FlatReferenceTableSample.Properties.flatreferencetableOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/MultiValuedEditorSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/MultiValuedEditorSamplePropertiesTestCase.java
index b0b93d05e..e66eb4bd5 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/MultiValuedEditorSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/MultiValuedEditorSamplePropertiesTestCase.java
@@ -150,7 +150,7 @@ public class MultiValuedEditorSamplePropertiesTestCase extends SWTBotEEFTestCase
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the multivaluededitorRequiredProperty feature of the MultiValuedEditorSample element 
-				bot.editPropertyMultiValuedEditorFeature(propertiesView, EefnrViewsRepository.MultiValuedEditorSample.multivaluededitorRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyMultiValuedEditorFeature(propertiesView, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -212,7 +212,7 @@ public class MultiValuedEditorSamplePropertiesTestCase extends SWTBotEEFTestCase
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the multivaluededitorOptionalProperty feature of the MultiValuedEditorSample element 
-				bot.editPropertyMultiValuedEditorFeature(propertiesView, EefnrViewsRepository.MultiValuedEditorSample.multivaluededitorOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyMultiValuedEditorFeature(propertiesView, EefnrViewsRepository.MultiValuedEditorSample.Properties.multivaluededitorOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/RadioSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/RadioSamplePropertiesTestCase.java
index 6da676e12..913a3f5e8 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/RadioSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/RadioSamplePropertiesTestCase.java
@@ -156,7 +156,7 @@ public class RadioSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the radioRequiredProperty feature of the RadioSample element 
-				bot.editPropertyRadioFeature(propertiesView, EefnrViewsRepository.RadioSample.radioRequiredProperty, enumValueForRadioRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyRadioFeature(propertiesView, EefnrViewsRepository.RadioSample.Properties.radioRequiredProperty, enumValueForRadioRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -217,7 +217,7 @@ public class RadioSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the radioOptionalProperty feature of the RadioSample element 
-				bot.editPropertyRadioFeature(propertiesView, EefnrViewsRepository.RadioSample.radioOptionalProperty, enumValueForRadioOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyRadioFeature(propertiesView, EefnrViewsRepository.RadioSample.Properties.radioOptionalProperty, enumValueForRadioOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/ReferencesTableSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/ReferencesTableSamplePropertiesTestCase.java
index 6c3ed807e..1309a8966 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/ReferencesTableSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/ReferencesTableSamplePropertiesTestCase.java
@@ -167,7 +167,7 @@ public class ReferencesTableSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableRequiredProperty feature of the ReferencesTableSample element 
-				bot.editPropertyReferencesTableFeature(propertiesView, EefnrViewsRepository.ReferencesTableSample.referencestableRequiredProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyReferencesTableFeature(propertiesView, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableRequiredProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -233,7 +233,7 @@ public class ReferencesTableSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableRequiredProperty feature of the ReferencesTableSample element 
-				bot.removePropertyReferencesTableFeature(propertiesView, EefnrViewsRepository.ReferencesTableSample.referencestableRequiredProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.removePropertyReferencesTableFeature(propertiesView, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableRequiredProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -295,7 +295,7 @@ public class ReferencesTableSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableOptionalProperty feature of the ReferencesTableSample element 
-				bot.editPropertyReferencesTableFeature(propertiesView, EefnrViewsRepository.ReferencesTableSample.referencestableOptionalProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyReferencesTableFeature(propertiesView, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableOptionalProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -361,7 +361,7 @@ public class ReferencesTableSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableOptionalProperty feature of the ReferencesTableSample element 
-				bot.removePropertyReferencesTableFeature(propertiesView, EefnrViewsRepository.ReferencesTableSample.referencestableOptionalProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.removePropertyReferencesTableFeature(propertiesView, EefnrViewsRepository.ReferencesTableSample.Properties.referencestableOptionalProperty, 0, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/SamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/SamplePropertiesTestCase.java
index f4deb31c3..a04ff8e1a 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/SamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/SamplePropertiesTestCase.java
@@ -146,7 +146,7 @@ public class SamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the textRequiredProperty feature of the Sample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.Sample.textRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.Sample.Properties.textRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -206,7 +206,7 @@ public class SamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the textOptionalProperty feature of the Sample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.Sample.textOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.Sample.Properties.textOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TableCompositionEditorSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TableCompositionEditorSamplePropertiesTestCase.java
index 46320409b..4af532a05 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TableCompositionEditorSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TableCompositionEditorSamplePropertiesTestCase.java
@@ -229,7 +229,7 @@ public class TableCompositionEditorSamplePropertiesTestCase extends SWTBotEEFTes
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the tablecompositionRequiredProperty feature of the TableCompositionEditorSample element 
-		bot.removePropertyTableCompositionFeature(propertiesView, EefnrViewsRepository.TableCompositionEditorSample.tablecompositionRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyTableCompositionFeature(propertiesView, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -355,7 +355,7 @@ public class TableCompositionEditorSamplePropertiesTestCase extends SWTBotEEFTes
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the tablecompositionOptionalProperty feature of the TableCompositionEditorSample element 
-		bot.removePropertyTableCompositionFeature(propertiesView, EefnrViewsRepository.TableCompositionEditorSample.tablecompositionOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyTableCompositionFeature(propertiesView, EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -376,9 +376,9 @@ public class TableCompositionEditorSamplePropertiesTestCase extends SWTBotEEFTes
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -387,7 +387,7 @@ public class TableCompositionEditorSamplePropertiesTestCase extends SWTBotEEFTes
 	 */
 	protected void editTableCompositiontablecompositionRequiredPropertyFeature(SWTBotView propertyView, SWTBotTreeItem selectNode) throws WidgetInvalidException {
 		SWTEEFBotHelper helper = new SWTEEFBotHelper(propertyView.bot());
-		helper.addButtonTableComposition(EefnrViewsRepository.TableCompositionEditorSample.tablecompositionRequiredProperty).click();
+		helper.addButtonTableComposition(EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionRequiredProperty).click();
 		editTableCompositionFortablecompositionRequiredPropertyFeature();
 		selectNode.select();
 	}
@@ -400,9 +400,9 @@ public class TableCompositionEditorSamplePropertiesTestCase extends SWTBotEEFTes
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -411,7 +411,7 @@ public class TableCompositionEditorSamplePropertiesTestCase extends SWTBotEEFTes
 	 */
 	protected void editTableCompositiontablecompositionOptionalPropertyFeature(SWTBotView propertyView, SWTBotTreeItem selectNode) throws WidgetInvalidException {
 		SWTEEFBotHelper helper = new SWTEEFBotHelper(propertyView.bot());
-		helper.addButtonTableComposition(EefnrViewsRepository.TableCompositionEditorSample.tablecompositionOptionalProperty).click();
+		helper.addButtonTableComposition(EefnrViewsRepository.TableCompositionEditorSample.Properties.tablecompositionOptionalProperty).click();
 		editTableCompositionFortablecompositionOptionalPropertyFeature();
 		selectNode.select();
 	}
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextSamplePropertiesTestCase.java
index 51b362a66..e63b33d40 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextSamplePropertiesTestCase.java
@@ -146,7 +146,7 @@ public class TextSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the textRequiredProperty feature of the TextSample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSample.textRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSample.Properties.textRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -206,7 +206,7 @@ public class TextSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the textOptionalProperty feature of the TextSample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSample.textOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSample.Properties.textOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextSampleWithTwoTabsPropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextSampleWithTwoTabsPropertiesTestCase.java
index 323f01318..5778b7cec 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextSampleWithTwoTabsPropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextSampleWithTwoTabsPropertiesTestCase.java
@@ -146,7 +146,7 @@ public class TextSampleWithTwoTabsPropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "TextSampleFirstTab");
 		
 		// Change value of the textOptionalPropertyInFirstTab feature of the TextSampleWithTwoTabs element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSampleFirstTab.textOptionalPropertyInFirstTab, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSampleFirstTab.Properties.textOptionalPropertyInFirstTab, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -206,7 +206,7 @@ public class TextSampleWithTwoTabsPropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "TextSampleFirstTab");
 		
 		// Change value of the textRequiredPropertyInFirstTab feature of the TextSampleWithTwoTabs element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSampleFirstTab.textRequiredPropertyInFirstTab, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSampleFirstTab.Properties.textRequiredPropertyInFirstTab, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -266,7 +266,7 @@ public class TextSampleWithTwoTabsPropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "TextSampleSecondTab");
 		
 		// Change value of the textOptionalPropertyInSecondTab feature of the TextSampleWithTwoTabs element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSampleSecondTab.textOptionalPropertyInSecondTab, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSampleSecondTab.Properties.textOptionalPropertyInSecondTab, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -326,7 +326,7 @@ public class TextSampleWithTwoTabsPropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "TextSampleSecondTab");
 		
 		// Change value of the textRequiredPropertyInSecondTab feature of the TextSampleWithTwoTabs element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSampleSecondTab.textRequiredPropertyInSecondTab, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextSampleSecondTab.Properties.textRequiredPropertyInSecondTab, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextareaSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextareaSamplePropertiesTestCase.java
index ab971bb34..9c8e73873 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextareaSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TextareaSamplePropertiesTestCase.java
@@ -146,7 +146,7 @@ public class TextareaSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the textareaRequiredProperty feature of the TextareaSample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextareaSample.textareaRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextareaSample.Properties.textareaRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -206,7 +206,7 @@ public class TextareaSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the textareaOptionalProperty feature of the TextareaSample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextareaSample.textareaOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TextareaSample.Properties.textareaOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TotalSamplePropertiesTestCase.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TotalSamplePropertiesTestCase.java
index 4fd1f3826..440b53d5b 100644
--- a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TotalSamplePropertiesTestCase.java
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src-gen/org/eclipse/emf/eef/eefnr/tests/junit/properties/TotalSamplePropertiesTestCase.java
@@ -214,7 +214,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the textRequiredProperty feature of the TotalSample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TotalSample.textRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TotalSample.Properties.textRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -274,7 +274,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the textOptionalProperty feature of the TotalSample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TotalSample.textOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TotalSample.Properties.textOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -335,7 +335,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the checkboxRequiredProperty feature of the TotalSample element 
-				bot.editPropertyEEFCheckbox(propertiesView, EefnrViewsRepository.TotalSample.checkboxRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFCheckbox(propertiesView, EefnrViewsRepository.TotalSample.Properties.checkboxRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -396,7 +396,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the checkboxOptionalProperty feature of the TotalSample element 
-				bot.editPropertyEEFCheckbox(propertiesView, EefnrViewsRepository.TotalSample.checkboxOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFCheckbox(propertiesView, EefnrViewsRepository.TotalSample.Properties.checkboxOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -456,7 +456,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the textareaRequiredProperty feature of the TotalSample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TotalSample.textareaRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TotalSample.Properties.textareaRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -516,7 +516,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the textareaOptionalProperty feature of the TotalSample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TotalSample.textareaOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TotalSample.Properties.textareaOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -577,7 +577,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the radioRequiredProperty feature of the TotalSample element 
-				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.radioRequiredProperty, enumValueForRadioRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.radioRequiredProperty, enumValueForRadioRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -638,7 +638,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the radioOptionalProperty feature of the TotalSample element 
-				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.radioOptionalProperty, enumValueForRadioOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.radioOptionalProperty, enumValueForRadioOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -700,7 +700,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerRequiredProperty feature of the TotalSample element 
-		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.eobjectflatcomboviewerRequiredProperty, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerRequiredProperty), bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerRequiredProperty, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerRequiredProperty), bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -762,7 +762,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerOptionalProperty feature of the TotalSample element 
-		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.eobjectflatcomboviewerOptionalProperty, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerOptionalProperty)+1, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty, allInstancesOf.indexOf(referenceValueForEobjectflatcomboviewerOptionalProperty)+1, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -823,7 +823,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the eobjectflatcomboviewerOptionalProperty feature of the TotalSample element 
-		bot.removePropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.eobjectflatcomboviewerOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.eobjectflatcomboviewerOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		
 		// Save the changement
@@ -886,7 +886,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableRequiredProperty feature of the TotalSample element 
-		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.referencestableRequiredProperty, referenceValueForReferencestableRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty, referenceValueForReferencestableRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -952,7 +952,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableRequiredProperty feature of the TotalSample element 
-		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.referencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.referencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1014,7 +1014,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableOptionalProperty feature of the TotalSample element 
-		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.referencestableOptionalProperty, referenceValueForReferencestableOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty, referenceValueForReferencestableOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1080,7 +1080,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the referencestableOptionalProperty feature of the TotalSample element 
-		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.referencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.referencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1141,7 +1141,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the emfcomboviewerRequiredProperty feature of the TotalSample element 
-				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.emfcomboviewerRequiredProperty, enumValueForEmfcomboviewerRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.emfcomboviewerRequiredProperty, enumValueForEmfcomboviewerRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1202,7 +1202,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the emfcomboviewerOptionalProperty feature of the TotalSample element 
-				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.emfcomboviewerOptionalProperty, enumValueForEmfcomboviewerOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEMFComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.emfcomboviewerOptionalProperty, enumValueForEmfcomboviewerOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1264,7 +1264,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the multivaluededitorRequiredProperty feature of the TotalSample element 
-				bot.editPropertyMultiValuedEditorFeature(propertiesView, EefnrViewsRepository.TotalSample.multivaluededitorRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyMultiValuedEditorFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.multivaluededitorRequiredProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1326,7 +1326,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the multivaluededitorOptionalProperty feature of the TotalSample element 
-				bot.editPropertyMultiValuedEditorFeature(propertiesView, EefnrViewsRepository.TotalSample.multivaluededitorOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyMultiValuedEditorFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.multivaluededitorOptionalProperty, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1452,7 +1452,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the tablecompositionRequiredProperty feature of the TotalSample element 
-		bot.removePropertyTableCompositionFeature(propertiesView, EefnrViewsRepository.TotalSample.tablecompositionRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyTableCompositionFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1578,7 +1578,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the tablecompositionOptionalProperty feature of the TotalSample element 
-		bot.removePropertyTableCompositionFeature(propertiesView, EefnrViewsRepository.TotalSample.tablecompositionOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyTableCompositionFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1640,7 +1640,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableRequiredProperty feature of the TotalSample element 
-		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.advancedreferencestableRequiredProperty, referenceValueForAdvancedreferencestableRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty, referenceValueForAdvancedreferencestableRequiredProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1706,7 +1706,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableRequiredProperty feature of the TotalSample element 
-		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.advancedreferencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1768,7 +1768,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableOptionalProperty feature of the TotalSample element 
-		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.advancedreferencestableOptionalProperty, referenceValueForAdvancedreferencestableOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty, referenceValueForAdvancedreferencestableOptionalProperty, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1834,7 +1834,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedreferencestableOptionalProperty feature of the TotalSample element 
-		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.advancedreferencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyAdvancedReferencesTableFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.advancedreferencestableOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1896,7 +1896,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerRequiredPropery feature of the TotalSample element 
-		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerRequiredPropery, allInstancesOf.indexOf(referenceValueForAdvancedeobjectflatcomboviewerRequiredPropery), bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerRequiredPropery, allInstancesOf.indexOf(referenceValueForAdvancedeobjectflatcomboviewerRequiredPropery), bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -1958,7 +1958,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerOptionalPropery feature of the TotalSample element 
-		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerOptionalPropery, allInstancesOf.indexOf(referenceValueForAdvancedeobjectflatcomboviewerOptionalPropery)+1, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.editPropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery, allInstancesOf.indexOf(referenceValueForAdvancedeobjectflatcomboviewerOptionalPropery)+1, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -2019,7 +2019,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedeobjectflatcomboviewerOptionalPropery feature of the TotalSample element 
-		bot.removePropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.advancedeobjectflatcomboviewerOptionalPropery, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyEObjectFlatComboViewerFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.advancedeobjectflatcomboviewerOptionalPropery, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		
 		// Save the changement
@@ -2148,7 +2148,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedtablecompositionRequiredProperty feature of the TotalSample element 
-		bot.removePropertyAdvancedTableCompositionFeature(propertiesView, EefnrViewsRepository.TotalSample.advancedtablecompositionRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyAdvancedTableCompositionFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -2276,7 +2276,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the advancedtablecompositionOptionalProperty feature of the TotalSample element 
-		bot.removePropertyAdvancedTableCompositionFeature(propertiesView, EefnrViewsRepository.TotalSample.advancedtablecompositionOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
+		bot.removePropertyAdvancedTableCompositionFeature(propertiesView, EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty, EefnrMessages.PropertiesEditionPart_RemoveListViewerLabel, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -2336,7 +2336,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		SWTBotView propertiesView = bot.prepareLiveEditing(modelEditor, firstInstanceOf, "Base");
 		
 		// Change value of the name feature of the TotalSample element 
-				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TotalSample.name, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
+				bot.editPropertyEEFText(propertiesView, EefnrViewsRepository.TotalSample.Properties.name, UPDATED_VALUE, bot.selectNode(modelEditor, firstInstanceOf));
 		
 		// Save the changement
 		bot.finalizeEdition(modelEditor);
@@ -2389,9 +2389,9 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -2400,7 +2400,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 	 */
 	protected void editTableCompositiontablecompositionRequiredPropertyFeature(SWTBotView propertyView, SWTBotTreeItem selectNode) throws WidgetInvalidException {
 		SWTEEFBotHelper helper = new SWTEEFBotHelper(propertyView.bot());
-		helper.addButtonTableComposition(EefnrViewsRepository.TotalSample.tablecompositionRequiredProperty).click();
+		helper.addButtonTableComposition(EefnrViewsRepository.TotalSample.Properties.tablecompositionRequiredProperty).click();
 		editTableCompositionFortablecompositionRequiredPropertyFeature();
 		selectNode.select();
 	}
@@ -2413,9 +2413,9 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -2424,7 +2424,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 	 */
 	protected void editTableCompositiontablecompositionOptionalPropertyFeature(SWTBotView propertyView, SWTBotTreeItem selectNode) throws WidgetInvalidException {
 		SWTEEFBotHelper helper = new SWTEEFBotHelper(propertyView.bot());
-		helper.addButtonTableComposition(EefnrViewsRepository.TotalSample.tablecompositionOptionalProperty).click();
+		helper.addButtonTableComposition(EefnrViewsRepository.TotalSample.Properties.tablecompositionOptionalProperty).click();
 		editTableCompositionFortablecompositionOptionalPropertyFeature();
 		selectNode.select();
 	}
@@ -2445,9 +2445,9 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -2456,7 +2456,7 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 	 */
 	protected void editAdvancedTableCompositionadvancedtablecompositionRequiredPropertyFeature(SWTBotView propertyView, SWTBotTreeItem selectNode) throws WidgetInvalidException {
 		SWTEEFBotHelper helper = new SWTEEFBotHelper(propertyView.bot());
-		helper.addButtonAdvancedTableComposition(EefnrViewsRepository.TotalSample.advancedtablecompositionRequiredProperty).click();
+		helper.addButtonAdvancedTableComposition(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionRequiredProperty).click();
 		editAdvancedTableCompositionForadvancedtablecompositionRequiredPropertyFeature();
 		selectNode.select();
 	}
@@ -2469,9 +2469,9 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 		bot.activateShell(shellTable);
 		Sample sample = (Sample) EEFTestsModelsUtils.getFirstInstanceOf(bot.getActiveResource(), sampleMetaClass);
 		// Change value of the textRequiredProperty feature of the textRequiredProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textRequiredProperty, sample.getTextRequiredProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textRequiredProperty, sample.getTextRequiredProperty());
 		// Change value of the textOptionalProperty feature of the textOptionalProperty element 
-				bot.editEEFText(EefnrViewsRepository.Sample.textOptionalProperty, sample.getTextOptionalProperty());
+				bot.editEEFText(EefnrViewsRepository.Sample.Properties.textOptionalProperty, sample.getTextOptionalProperty());
 		bot.closeShellWithFinishButton(shellTable);
 	}	
 	/**
@@ -2479,8 +2479,8 @@ public class TotalSamplePropertiesTestCase extends SWTBotEEFTestCase {
 	 * @param wizardShell
 	 */
 	protected void editAdvancedTableCompositionadvancedtablecompositionOptionalPropertyFeature(SWTBotView propertyView, SWTBotTreeItem selectNode) throws WidgetInvalidException {
-		SWTEEFBotHelper helper = new SWTEEFBotHelper(propertyView.bot());
-		helper.addButtonAdvancedTableComposition(EefnrViewsRepository.TotalSample.advancedtablecompositionOptionalProperty).click();
+		SWTEEFBotHelper helper = new SWTEEFBotHelper(propertyView.bot());

+		helper.addButtonAdvancedTableComposition(EefnrViewsRepository.TotalSample.Properties.advancedtablecompositionOptionalProperty).click();

 		editAdvancedTableCompositionForadvancedtablecompositionOptionalPropertyFeature();
 		selectNode.select();
 	}
diff --git a/tests/org.eclipse.emf.eef.tests.nonreg.junit/src/org/eclipse/emf/eef/tests/nonreg/junit/compositionsequence/TestCompositionSequence.java b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src/org/eclipse/emf/eef/tests/nonreg/junit/compositionsequence/TestCompositionSequence.java
new file mode 100644
index 000000000..e17b73e5e
--- /dev/null
+++ b/tests/org.eclipse.emf.eef.tests.nonreg.junit/src/org/eclipse/emf/eef/tests/nonreg/junit/compositionsequence/TestCompositionSequence.java
@@ -0,0 +1,162 @@
+/**
+ * 
+ */
+package org.eclipse.emf.eef.tests.nonreg.junit.compositionsequence;
+
+import junit.framework.TestCase;
+
+import org.eclipse.emf.eef.runtime.ui.parts.sequence.CompositionSequence;
+import org.eclipse.emf.eef.runtime.ui.parts.sequence.CompositionStep;
+
+
+/**
+ * @author <a href="mailto:goulwen.lefur@obeo.fr">Goulwen Le Fur</a>
+ *
+ */
+public class TestCompositionSequence extends TestCase {
+	
+	/**
+	 * Test the composition process
+	 */
+	public void testSimpleCompositionSequence() {
+		CompositionSequence sequence = new CompositionSequence();
+		sequence.addStep("G1").addStep("E1");
+		CompositionStep group2 = sequence.addStep("G2");
+		group2.addStep("E2");
+		group2.addStep("E3");
+		
+		String toString = toString(sequence);
+		assert toString.equals("G1E1G2E2E3");
+	}
+
+	/**
+	 * Test an advanced composition process
+	 */
+	public void testAdvancedCompositionSequence() {
+		CompositionSequence sequence1 = createAdvancedSequence();
+		CompositionStep currentStep = sequence1.next();
+		StringBuffer track = new StringBuffer();
+		do {
+			track.append(currentStep.key);
+			currentStep = currentStep.next();
+		} while (currentStep != null);
+		
+		assert track.toString().equals("123456789101112");
+	}
+	
+	
+	/**
+	 * Test the before method
+	 */
+	public void testBefore() {
+		CompositionSequence sequence1 = createAdvancedSequence();
+		CompositionStep currentStep = sequence1;
+		CompositionStep next = currentStep.next();
+		while (next != null) {
+			currentStep = next;
+			next = currentStep.next();
+		}
+		CompositionStep before = currentStep.before();
+		StringBuffer track = new StringBuffer();
+		while (before != null) {
+			track.append(before.key);
+			before = before.before();
+		}
+		assert track.toString().equals("121110987654321");
+		
+	}
+
+	/**
+	 * Test the before method
+	 */
+	public void testUp() {
+		CompositionSequence sequence1 = new CompositionSequence();
+		CompositionStep group1 = sequence1.addStep("G1");
+		CompositionStep e1 = group1.addStep("E1");
+		CompositionStep e2 = group1.addStep("E2");
+		CompositionStep group2 = sequence1.addStep("G2");
+		CompositionStep e3 = group2.addStep("E3");
+		CompositionStep e4 = group2.addStep("E4");
+		assert toString(sequence1).equals("G1E1E2G2E3E4");		
+		e2.up();
+		assert toString(sequence1).equals("G1E2E1G2E3E4");		
+		group2.up();
+		assert toString(sequence1).equals("G2E3E4G1E2E1");		
+	}
+	
+	/**
+	 * Test the before method
+	 */
+	public void testDown() {
+		CompositionSequence sequence1 = new CompositionSequence();
+		CompositionStep group1 = sequence1.addStep("G1");
+		CompositionStep e1 = group1.addStep("E1");
+		CompositionStep e2 = group1.addStep("E2");
+		CompositionStep group2 = sequence1.addStep("G2");
+		CompositionStep e3 = group2.addStep("E3");
+		CompositionStep e4 = group2.addStep("E4");
+		assert toString(sequence1).equals("G1E1E2G2E3E4");		
+		e3.down();
+		assert toString(sequence1).equals("G1E1E2G2E4E3");		
+		group1.down();
+		assert toString(sequence1).equals("G2E4E3G1E1E2");		
+	}
+	
+	/**
+	 * Test the before method
+	 */
+	public void testMove() {
+		CompositionSequence sequence1 = new CompositionSequence();
+		CompositionStep group1 = sequence1.addStep("G1");
+		CompositionStep e1 = group1.addStep("E1");
+		CompositionStep e2 = group1.addStep("E2");
+		CompositionStep group2 = sequence1.addStep("G2");
+		CompositionStep e3 = group2.addStep("E3");
+		CompositionStep e4 = group2.addStep("E4");
+		assert toString(sequence1).equals("G1E1E2G2E3E4");		
+		e3.moveTo(group1);
+		assert toString(sequence1).equals("G1E1E2E3G2E4");		
+		group1.moveTo(group2);
+		group2.addStep("E5");
+		assert toString(sequence1).equals("G2E4G1E1E2E3E5");		
+	}
+	
+	/**
+	 * @param sequence
+	 * @return
+	 */
+	private String toString(CompositionSequence sequence) {
+		CompositionStep currentStep = sequence.next();
+		StringBuffer track = new StringBuffer();
+		do {
+			track.append(currentStep.key);
+			currentStep = currentStep.next();
+		} while (currentStep != null);
+		
+		String toString = track.toString();
+		return toString;
+	}
+
+	/**
+	 * @return an complex sequence
+	 */
+	private CompositionSequence createAdvancedSequence() {
+		CompositionSequence sequence1 = new CompositionSequence();
+		sequence1.addStep("1").addStep("2");
+		CompositionStep group2 = sequence1.addStep("3");
+		group2.addStep("4");
+		group2.addStep("5");
+		group2.addStep("6").addStep("7");
+		CompositionSequence sequence2 = new CompositionSequence(sequence1, "Sub-sequence 1");
+		CompositionStep group3 = sequence2.addStep("8");
+		group3.addStep("9");
+		group3.addStep("10");
+		sequence2.addStep("11");
+		group2.addStep(sequence2);
+		sequence1.addStep("12");
+		return sequence1;
+	}
+
+	
+	
+}