bug 579069 - Make papyrus Req compatible with SysML1.6

Change-Id: Ica6840f755452f9407c9760068792b4dcd6137d0
Signed-off-by: Patrick <Patrick.Tessier@cea.fr>
diff --git a/features/org.eclipse.papyrus.requirements.controler.feature/feature.xml b/features/org.eclipse.papyrus.requirements.controler.feature/feature.xml
index 75c15c3..a9aecfe 100644
--- a/features/org.eclipse.papyrus.requirements.controler.feature/feature.xml
+++ b/features/org.eclipse.papyrus.requirements.controler.feature/feature.xml
@@ -53,7 +53,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.papyrus.requirements.sysml14.preferences"
+         id="org.eclipse.papyrus.requirements.sysml.preferences"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/META-INF/MANIFEST.MF b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/META-INF/MANIFEST.MF
index a852b75..e44b6c6 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/META-INF/MANIFEST.MF
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-Activator: org.eclipse.papyrus.requirements.sysml14.assistant.commands.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.papyrus.uml.tools,
- org.eclipse.papyrus.requirements.sysml14.preferences,
+ org.eclipse.papyrus.requirements.sysml.preferences,
  org.eclipse.papyrus.requirements.sysml.common,
  org.eclipse.papyrus.sysml14
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/src/org/eclipse/papyrus/requirements/sysml14/assistant/commands/ExtractCommentCommand.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/src/org/eclipse/papyrus/requirements/sysml14/assistant/commands/ExtractCommentCommand.java
index 3460940..3d8c129 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/src/org/eclipse/papyrus/requirements/sysml14/assistant/commands/ExtractCommentCommand.java
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/src/org/eclipse/papyrus/requirements/sysml14/assistant/commands/ExtractCommentCommand.java
@@ -21,7 +21,7 @@
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.papyrus.requirements.sysml.common.I_SysMLStereotype;
-import org.eclipse.papyrus.requirements.sysml14.preferences.PreferenceConstants;
+import org.eclipse.papyrus.requirements.sysml.preferences.PreferenceConstants;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Comment;
 import org.eclipse.uml2.uml.Element;
@@ -55,7 +55,7 @@
 	 * @param requirement
 	 */
 	protected void parseAndExecute(Class requirement) {
-		IPreferenceStore store = org.eclipse.papyrus.requirements.sysml14.preferences.Activator.getDefault().getPreferenceStore();
+		IPreferenceStore store = org.eclipse.papyrus.requirements.sysml.preferences.Activator.getDefault().getPreferenceStore();
 		String initialChar = store.getString(PreferenceConstants.INITIAL_CHAR);
 		String finalChar = store.getString(PreferenceConstants.FINAL_CHAR);
 		String meaningOfTextBetweenChars = store.getString(PreferenceConstants.MEANING_OF_TEXT_BETWEEN_CHARS);
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/src/org/eclipse/papyrus/requirements/sysml14/assistant/commands/SetIdCommand.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/src/org/eclipse/papyrus/requirements/sysml14/assistant/commands/SetIdCommand.java
index a4589e1..c84ea46 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/src/org/eclipse/papyrus/requirements/sysml14/assistant/commands/SetIdCommand.java
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.assistant.commands/src/org/eclipse/papyrus/requirements/sysml14/assistant/commands/SetIdCommand.java
@@ -20,7 +20,7 @@
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.papyrus.requirements.sysml.common.I_SysMLStereotype;
-import org.eclipse.papyrus.requirements.sysml14.preferences.PreferenceConstants;
+import org.eclipse.papyrus.requirements.sysml.preferences.PreferenceConstants;
 import org.eclipse.papyrus.sysml14.requirements.Requirement;
 import org.eclipse.uml2.uml.Class;
 import org.eclipse.uml2.uml.Classifier;
@@ -45,7 +45,7 @@
 
 	@Override
 	protected void doExecute() {
-		IPreferenceStore store = org.eclipse.papyrus.requirements.sysml14.preferences.Activator.getDefault().getPreferenceStore();
+		IPreferenceStore store = org.eclipse.papyrus.requirements.sysml.preferences.Activator.getDefault().getPreferenceStore();
 		int digit = store.getInt(PreferenceConstants.REQUIREMENT_ID_DIGIT);// by
 		String separator = store.getString(PreferenceConstants.CHILD_REQUIREMENTS_SEPARATOR);
 
@@ -91,7 +91,7 @@
 	}
 
 	protected void setIdforClassifier(String prefix, Classifier classifier) {
-		IPreferenceStore store = org.eclipse.papyrus.requirements.sysml14.preferences.Activator.getDefault().getPreferenceStore();
+		IPreferenceStore store = org.eclipse.papyrus.requirements.sysml.preferences.Activator.getDefault().getPreferenceStore();
 		int digit = store.getInt(PreferenceConstants.REQUIREMENT_ID_DIGIT);// by
 		String separator = store.getString(PreferenceConstants.CHILD_REQUIREMENTS_SEPARATOR);
 
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.common/META-INF/MANIFEST.MF b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.common/META-INF/MANIFEST.MF
index 6130f1c..ef6b721 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.common/META-INF/MANIFEST.MF
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.common/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
  org.eclipse.papyrus.infra.services.edit,
  org.eclipse.papyrus.uml.tools.utils,
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.8.0",
- org.eclipse.papyrus.requirements.sysml14.preferences,
+ org.eclipse.papyrus.requirements.sysml.preferences,
  org.eclipse.papyrus.uml.types.core
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.common/src/org/eclipse/papyrus/requirements/sysml/common/Utils.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.common/src/org/eclipse/papyrus/requirements/sysml/common/Utils.java
index c306a0c..e5dde95 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.common/src/org/eclipse/papyrus/requirements/sysml/common/Utils.java
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.common/src/org/eclipse/papyrus/requirements/sysml/common/Utils.java
@@ -22,7 +22,7 @@
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.papyrus.requirements.sysml14.preferences.PreferenceConstants;
+import org.eclipse.papyrus.requirements.sysml.preferences.PreferenceConstants;
 import org.eclipse.papyrus.sysml14.requirements.Requirement;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.uml2.uml.Class;
@@ -112,7 +112,7 @@
 	 * @return the name for a potential requirement
 	 */
 	public static String getNewRequirementID(Element parent) {
-		IPreferenceStore store = org.eclipse.papyrus.requirements.sysml14.preferences.Activator.getDefault().getPreferenceStore();
+		IPreferenceStore store = org.eclipse.papyrus.requirements.sysml.preferences.Activator.getDefault().getPreferenceStore();
 
 		String prefix = store.getString(PreferenceConstants.REQUIREMENT_ID_PREFIX);// by
 																					// default
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/.classpath b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/.classpath
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/.classpath
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/.classpath
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/.project b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/.project
similarity index 90%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/.project
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/.project
index a59da17..461b1a0 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/.project
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.requirements.sysml14.preferences</name>
+	<name>org.eclipse.papyrus.requirements.sysml.preferences</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/.settings/org.eclipse.jdt.core.prefs b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/.settings/org.eclipse.jdt.core.prefs
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/.settings/org.eclipse.jdt.ui.prefs b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/.settings/org.eclipse.jdt.ui.prefs
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/META-INF/MANIFEST.MF b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/META-INF/MANIFEST.MF
similarity index 65%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/META-INF/MANIFEST.MF
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/META-INF/MANIFEST.MF
index 733973b..79c1d97 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/META-INF/MANIFEST.MF
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Bundle-SymbolicName: org.eclipse.papyrus.requirements.sysml14.preferences;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.requirements.sysml.preferences;singleton:=true
 Bundle-Version: 0.7.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.requirements.sysml14.preferences.Activator
+Bundle-Activator: org.eclipse.papyrus.requirements.sysml.preferences.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.requirements.sysml14.preferences;
+Export-Package: org.eclipse.papyrus.requirements.sysml.preferences;
   uses:="org.osgi.framework,
    org.eclipse.ui,
    org.eclipse.jface.preference,
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/about.html b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/about.html
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/about.html
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/about.html
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/build.properties b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/build.properties
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/build.properties
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/build.properties
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/bundle.properties b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/bundle.properties
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/bundle.properties
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/bundle.properties
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/plugin.xml b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/plugin.xml
similarity index 100%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/plugin.xml
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/plugin.xml
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/pom.xml b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/pom.xml
similarity index 93%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/pom.xml
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/pom.xml
index 77cac66..fb55316 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/pom.xml
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/pom.xml
@@ -28,7 +28,7 @@
 	</parent>
 	
 	<!-- POM Description -->
-	<artifactId>org.eclipse.papyrus.requirements.sysml14.preferences</artifactId>
+	<artifactId>org.eclipse.papyrus.requirements.sysml.preferences</artifactId>
 	<packaging>eclipse-plugin</packaging>
 	<version>0.7.0-SNAPSHOT</version>
 </project>
\ No newline at end of file
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/Activator.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/Activator.java
similarity index 95%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/Activator.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/Activator.java
index dd21861..050c8cc 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/Activator.java
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/Activator.java
@@ -10,7 +10,7 @@
  * Contributors:
 *     CEA LIST. - initial API and implementation
 *******************************************************************************/
-package org.eclipse.papyrus.requirements.sysml14.preferences;
+package org.eclipse.papyrus.requirements.sysml.preferences;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/PreferenceConstants.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/PreferenceConstants.java
similarity index 95%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/PreferenceConstants.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/PreferenceConstants.java
index f9e2c54..15ae35c 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/PreferenceConstants.java
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/PreferenceConstants.java
@@ -12,7 +12,7 @@
  *     Mauricio Alférez (mauricio.alferez@cea.fr) CEA LIST
  *     
  ******************************************************************************/
-package org.eclipse.papyrus.requirements.sysml14.preferences;
+package org.eclipse.papyrus.requirements.sysml.preferences;
 
 /**
  * Constant definitions for plug-in preferences
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/PreferenceInitializer.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/PreferenceInitializer.java
similarity index 95%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/PreferenceInitializer.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/PreferenceInitializer.java
index e04d8e9..7755ae5 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/PreferenceInitializer.java
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/PreferenceInitializer.java
@@ -12,7 +12,7 @@
  *     Mauricio Alferez (mauricio.alferez@cea.fr) CEA LIST - Bugs 477726, 478595, 481377, ...
  *     
  ******************************************************************************/
-package org.eclipse.papyrus.requirements.sysml14.preferences;
+package org.eclipse.papyrus.requirements.sysml.preferences;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/PreferencePage.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/PreferencePage.java
similarity index 97%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/PreferencePage.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/PreferencePage.java
index 4b0ad77..bd72aa5 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/PreferencePage.java
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/PreferencePage.java
@@ -13,7 +13,7 @@
  *     
  *******************************************************************************/
 
-package org.eclipse.papyrus.requirements.sysml14.preferences;
+package org.eclipse.papyrus.requirements.sysml.preferences;
 
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
diff --git a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/handlers/ShowPreferencePageHandler.java b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/handlers/ShowPreferencePageHandler.java
similarity index 95%
rename from plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/handlers/ShowPreferencePageHandler.java
rename to plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/handlers/ShowPreferencePageHandler.java
index 44ad2a3..7ed9492 100644
--- a/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml14.preferences/src/org/eclipse/papyrus/requirements/sysml14/preferences/handlers/ShowPreferencePageHandler.java
+++ b/plugins/sysml14/controler/org.eclipse.papyrus.requirements.sysml.preferences/src/org/eclipse/papyrus/requirements/sysml/preferences/handlers/ShowPreferencePageHandler.java
@@ -12,7 +12,7 @@
  * 		Mauricio Alferez (mauricio.alferez@cea.fr) CEA LIST - Initial API and implementation
  *
  *****************************************************************************/
-package org.eclipse.papyrus.requirements.sysml14.preferences.handlers;
+package org.eclipse.papyrus.requirements.sysml.preferences.handlers;
 
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
diff --git a/plugins/sysml14/controler/pom.xml b/plugins/sysml14/controler/pom.xml
index a4c22e1..b583313 100644
--- a/plugins/sysml14/controler/pom.xml
+++ b/plugins/sysml14/controler/pom.xml
@@ -40,7 +40,7 @@
          <module>org.eclipse.papyrus.requirements.sysml.traceability.assistant</module>
          <module>org.eclipse.papyrus.requirements.sysml.traceability.commands</module>
          <module>org.eclipse.papyrus.requirements.sysml.verification</module>
-         <module>org.eclipse.papyrus.requirements.sysml14.preferences</module>
+         <module>org.eclipse.papyrus.requirements.sysml.preferences</module>
          <module>org.eclipse.papyrus.requirements.sysml.papyrusre</module>
          <module>org.eclipse.papyrus.requirements.sysml.papyrusre.modellibrary</module>
 	</modules>