Bug 499150 - [Components][archetype] redefine the artifactid variable

-to restore sompatibility with sysml i have introduce a fullartifactId
variable
-usage mvn archetype:generate
-DarchetypeGroupId=org.eclipse.papyrus.components
-DarchetypeArtifactId=org.eclipse.papyrus.components.archetype
-DarchetypeVersion=0.0.14-SNAPSHOT -DgroupId=org.eclipse.papyrus.mosa
-DartifactId=security -DfullartifactId=org.eclipse.papyrus.mosa.security
-Dversion=0.0.1 -DcomponentName=Security -DhudsonViewName=HUDSON
-DbugzillaName=BUGZILLA; 


Change-Id: I3fc0fdd8d5aa41fd4ae12fcec891501278a56be7
Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/pom.xml
index 18b5649..5ea486a 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.papyrus.components</groupId>
 		<artifactId>org.eclipse.papyrus.components.parent</artifactId>
-		<version>0.0.13</version>
+		<version>0.0.14</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.components.archetype</artifactId>
 	<packaging>jar</packaging>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 082fa87..765c9e6 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -10,6 +10,9 @@
     <requiredProperty key="bugzillaName" >
       <defaultValue/>
     </requiredProperty>
+    <requiredProperty key="fullartifactId" >
+      <defaultValue/>
+    </requiredProperty>
     
     <requiredProperty key="author" >
       <defaultValue>flefevre</defaultValue>
@@ -26,32 +29,32 @@
     </fileSet>
   
   	 <fileSet filtered="true" packaged="false" encoding="UTF-8">
-      <directory >changes</directory>
+      <directory >src/changes</directory>
     </fileSet>
         <fileSet filtered="true" packaged="false" encoding="UTF-8">
-      <directory >etc</directory>
+      <directory >src/etc</directory>
     </fileSet>
     <!-- SITE -->
     <fileSet filtered="true" packaged="false" encoding="UTF-8">
-      <directory >site</directory>
+      <directory >src/site</directory>
       <includes>
       	<include>site.xml</include>
       </includes>
     </fileSet>
     <fileSet filtered="true" packaged="false" encoding="UTF-8">
-      <directory >site/fml</directory>
+      <directory >src/site/fml</directory>
     </fileSet>
     <fileSet filtered="true" packaged="false" encoding="UTF-8">
-      <directory >site/markdown</directory>
+      <directory >src/site/markdown</directory>
     </fileSet>
     <fileSet filtered="true" packaged="false" encoding="UTF-8">
-      <directory >site/pdf</directory>
+      <directory >src/site/pdf</directory>
     </fileSet>
     <fileSet filtered="false" packaged="false" encoding="UTF-8">
-      <directory >site/resources</directory>
+      <directory >src/site/resources</directory>
     </fileSet>
     <fileSet filtered="true" packaged="false" encoding="UTF-8">
-      <directory >site/xdoc</directory>
+      <directory >src/site/xdoc</directory>
     </fileSet>
     <!-- CORE -->
     <fileSet filtered="true" packaged="false" encoding="UTF-8">
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/META-INF/MANIFEST.MF b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/META-INF/MANIFEST.MF
similarity index 80%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/META-INF/MANIFEST.MF
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/META-INF/MANIFEST.MF
index 31e7961..c2ef8a4 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/META-INF/MANIFEST.MF
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: ${groupId}.${artifactId};singleton:=true
+Bundle-SymbolicName: ${fullartifactId};singleton:=true
 Bundle-Version: ${version}.qualifier
 Bundle-ClassPath: .
-Bundle-Activator: ${groupId}.${artifactId}.Activator
+Bundle-Activator: ${fullartifactId}.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
  org.eclipse.emf.ecore;visibility:=reexport;bundle-version="[2.11.2,3.0.0)",
  org.eclipse.uml2.uml.profile.standard;visibility:=reexport;bundle-version="[1.0.100,2.0.0)",
@@ -12,8 +12,8 @@
  org.eclipse.uml2.uml;visibility:=reexport;bundle-version="[5.1.0,6.0.0)",
  org.eclipse.uml2.uml.resources;bundle-version="[5.1.0,6.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: ${groupId}.${artifactId},
- ${groupId}.${artifactId}.util
+Export-Package: ${fullartifactId},
+ ${fullartifactId}.util
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Bundle-Description: %Bundle-Description
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/README.md b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/README.md
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/README.md
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/README.md
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/about.html b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/about.html
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/about.html
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/about.html
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/build.properties b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/build.properties
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/build.properties
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/build.properties
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/plugin.properties b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/plugin.properties
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/plugin.properties
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/plugin.properties
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/plugin.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/plugin.xml
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/plugin.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/plugin.xml
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/pom.xml
similarity index 76%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/pom.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/pom.xml
index 56a5063..fc780af 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.core</artifactId>
+		<artifactId>${fullartifactId}.core</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>
-	<artifactId>${groupId}.${artifactId}</artifactId>
+	<artifactId>${fullartifactId}</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<name>${groupId}.${artifactId}</name>
+	<name>${fullartifactId}</name>
 	<description>This plug-in contains the XXXXXXXXX.</description>
 </project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/profile/__artifactId__.ecore b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/profile/__artifactId__.ecore
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/profile/__artifactId__.ecore
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/profile/__artifactId__.ecore
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/profile/__artifactId__.genmodel b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/profile/__artifactId__.genmodel
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/profile/__artifactId__.genmodel
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/profile/__artifactId__.genmodel
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/profile/__artifactId__.profile.di b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/profile/__artifactId__.profile.di
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/profile/__artifactId__.profile.di
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/profile/__artifactId__.profile.di
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/profile/__artifactId__.profile.notation b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/profile/__artifactId__.profile.notation
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/profile/__artifactId__.profile.notation
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/profile/__artifactId__.profile.notation
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/profile/__artifactId__.profile.uml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/profile/__artifactId__.profile.uml
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/profile/__artifactId__.profile.uml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/profile/__artifactId__.profile.uml
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/test.txt b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/test.txt
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/resources/test.txt
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/resources/test.txt
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/src/org/eclipse/papyrus/__artifactId__/Activator.java b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/src/org/eclipse/papyrus/__artifactId__/Activator.java
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__groupId__.__artifactId__/src/org/eclipse/papyrus/__artifactId__/Activator.java
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/__fullartifactId__/src/org/eclipse/papyrus/__artifactId__/Activator.java
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/pom.xml
index 419a98a..d63bf61 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/core/pom.xml
@@ -4,14 +4,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.parent</artifactId>
+		<artifactId>${fullartifactId}.parent</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>	
-	<artifactId>${groupId}.${artifactId}.core</artifactId>
+	<artifactId>${fullartifactId}.core</artifactId>
 	<packaging>pom</packaging>
 	<name>${componentName} Core</name>
 	<description>${componentName} Core contains all semantic information for ${componentName} profile. These modules should'nt contain any gui elements.</description>
 	<modules>
-		<module>${groupId}.${artifactId}</module>
+		<module>${fullartifactId}</module>
 	</modules>
 </project>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/pom.xml
index 019ad69..1a05bef 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/pom.xml
@@ -9,7 +9,7 @@
 	</parent>
 
 	<groupId>\${groupId}</groupId>
-	<artifactId>\${groupId}.\${artifactId}.parent</artifactId>
+	<artifactId>\${fullartifactId}.parent</artifactId>
 	<version>\${version}-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
@@ -19,13 +19,13 @@
 	
 	<properties>
 		<component.shortname>\${componentName}</component.shortname>
-		<component.artifactId>\${artifactId}</component.artifactId>
+		<component.fullartifactId>\${fullartifactId}</component.fullartifactId>
 		<component.hudson.tabname>\${hudsonViewName}</component.hudson.tabname>
 		<component.bugzilla.name>\${bugzillaName}</component.bugzilla.name>
 		<component.package.rootname>\${groupId}</component.package.rootname>
-		<component.rcp.name>\${groupId}.\${artifactId}.rcp</component.rcp.name>
+		<component.rcp.name>\${fullartifactId}.rcp</component.rcp.name>
 		<component.apibaseline.url>http://download.eclipse.org/modeling/mdt/papyrus/components/\${componentName}/</component.apibaseline.url>
-		<component.servicetype>\${groupId}.\${artifactId}.service.types</component.servicetype>
+		<component.servicetype>\${fullartifactId}.service.types</component.servicetype>
 		<eclipse.targetrelease>neon</eclipse.targetrelease>
 		<target.version>\${project.version}</target.version>
 		<!-- Default header linked to EPL license -->
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/build.properties b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/build.properties
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/build.properties
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/build.properties
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/epl-v10.html b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/epl-v10.html
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/epl-v10.html
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/epl-v10.html
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/feature.properties b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/feature.properties
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/feature.properties
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/feature.properties
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/feature.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/feature.xml
similarity index 97%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/feature.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/feature.xml
index 5989232..5deeea6 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/feature.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="${groupId}.${artifactId}.feature"
+      id="${fullartifactId}.feature"
       label="%featureName"
       version="${version}.qualifier"
       provider-name="%providerName">
@@ -102,11 +102,11 @@
       <import plugin="org.eclipse.papyrus.infra.core.sasheditor" version="2.0.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.uml.nattable.menu" version="1.1.0" match="compatible"/>
       <import plugin="org.eclipse.papyrus.uml.service.types.ui" version="1.2.0" match="compatible"/>
-      <!--import plugin="${groupId}.${artifactId}" version="${version}" match="greaterOrEqual"/-->
+      <!--import plugin="${fullartifactId}" version="${version}" match="greaterOrEqual"/-->
    </requires>
 
    <plugin
-         id="${groupId}.${artifactId}"
+         id="${fullartifactId}"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/license.html b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/license.html
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/license.html
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/license.html
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/pom.xml
similarity index 76%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/pom.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/pom.xml
index 2ba37a6..2ad600c 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.feature/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.feature/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.releng</artifactId>
+		<artifactId>${fullartifactId}.releng</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>
-	<artifactId>${groupId}.${artifactId}.feature</artifactId>
+	<artifactId>${fullartifactId}.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<name>${groupId}.${artifactId}.feature</name>
+	<name>${fullartifactId}.feature</name>
 	<description>This plugin gather all ${componentName} plugins to define a fully functionnal DSML editor.</description>
 </project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/category.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/category.xml
new file mode 100644
index 0000000..db7818d
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/category.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+	<feature id="${groupId}.feature" url="features/${fullartifactId}.feature_${version}.qualifier.jar" version="${version}.qualifier">
+		<category name="org.eclipse.papyrus.category"/>
+	</feature>
+	<feature id="${groupId}.feature.source" url="features/${fullartifactId}.feature.source_${version}.qualifier.jar" version="${version}.qualifier">
+		<category name="org.eclipse.papyrus.category"/>
+	</feature>
+	<category-def label="Papyrus ${componentName} Category" name="org.eclipse.papyrus.category">
+		<description>Papyrus ${componentName} Category</description>
+	</category-def>
+</site>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/pom.xml
similarity index 95%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/pom.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/pom.xml
index 452abec..605946b 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.releng</artifactId>
+		<artifactId>${fullartifactId}.releng</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>
-	<artifactId>${groupId}.${artifactId}.p2</artifactId>
+	<artifactId>${fullartifactId}.p2</artifactId>
 	<packaging>eclipse-repository</packaging>
 	<pluginRepositories>
 		<pluginRepository>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/siteTemplate/index.html b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/siteTemplate/index.html
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/siteTemplate/index.html
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/siteTemplate/index.html
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/siteTemplate/web/img/__componentName__-banner.png b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/siteTemplate/web/img/__componentName__-banner.png
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/siteTemplate/web/img/__componentName__-banner.png
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/siteTemplate/web/img/__componentName__-banner.png
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/siteTemplate/web/site.css b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/siteTemplate/web/site.css
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/siteTemplate/web/site.css
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/siteTemplate/web/site.css
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/siteTemplate/xslt/site.properties.xsl b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/siteTemplate/xslt/site.properties.xsl
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/siteTemplate/xslt/site.properties.xsl
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/siteTemplate/xslt/site.properties.xsl
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/siteTemplate/xslt/site.xsl b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/siteTemplate/xslt/site.xsl
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/siteTemplate/xslt/site.xsl
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.p2/siteTemplate/xslt/site.xsl
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/category.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/category.xml
new file mode 100644
index 0000000..7e6a08f
--- /dev/null
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/category.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/${fullartifactId}.feature_${version}.qualifier.jar" id="${fullartifactId}.feature" version="${version}.qualifier"/>
+</site>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/papyrus__artifactId__.product b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/papyrus__artifactId__.product
similarity index 93%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/papyrus__artifactId__.product
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/papyrus__artifactId__.product
index a4f9c39..0b0ad66 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/papyrus__artifactId__.product
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/papyrus__artifactId__.product
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Papyrus ${componentName}" uid="${groupId}.${artifactId}.product" id="${groupId}.${artifactId}.rcp.product" application="org.eclipse.ui.ide.workbench" version="${version}.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Papyrus ${componentName}" uid="${fullartifactId}.product" id="${fullartifactId}.rcp.product" application="org.eclipse.ui.ide.workbench" version="${version}.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
-      <image path="/${groupId}.${artifactId}.rcp/icons/papyrus_lg.png"/>
+      <image path="/${fullartifactId}.rcp/icons/papyrus_lg.png"/>
       <text>
          Papyrus ${componentName} (Beta - Incubation)
 
@@ -28,19 +28,19 @@
       </vmArgsMac>
    </launcherArgs>
 
-   <windowImages i16="/${groupId}.${artifactId}.rcp/icons/papyrus16.png" i32="/${groupId}.${artifactId}.rcp/icons/papyrus32.png" i48="/${groupId}.${artifactId}.rcp/icons/papyrus48.png" i64="/${groupId}.${artifactId}.rcp/icons/papyrus64.png" i128="/${groupId}.${artifactId}.rcp/icons/papyrus128.png"/>
+   <windowImages i16="/${fullartifactId}.rcp/icons/papyrus16.png" i32="/${fullartifactId}.rcp/icons/papyrus32.png" i48="/${fullartifactId}.rcp/icons/papyrus48.png" i64="/${fullartifactId}.rcp/icons/papyrus64.png" i128="/${fullartifactId}.rcp/icons/papyrus128.png"/>
 
    <splash
-      location="${groupId}.${artifactId}.rcp"
+      location="${fullartifactId}.rcp"
       startupProgressRect="0,330,460,20"
       startupMessageRect="7,4,445,16"
       startupForegroundColor="9C9E9F" />
    <launcher name="papyrus${componentName}">
-      <linux icon="../${groupId}.${artifactId}.rcp/icons/icon.xpm"/>
-      <macosx icon="../${groupId}.${artifactId}.rcp/icons/papyrus.icns"/>
+      <linux icon="../${fullartifactId}.rcp/icons/icon.xpm"/>
+      <macosx icon="../${fullartifactId}.rcp/icons/papyrus.icns"/>
       <solaris/>
       <win useIco="true">
-         <ico path="../${groupId}.${artifactId}.rcp/icons/papyrus.ico"/>
+         <ico path="../${fullartifactId}.rcp/icons/papyrus.ico"/>
          <bmp/>
       </win>
    </launcher>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/plugin_customization.ini b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/plugin_customization.ini
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/plugin_customization.ini
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/plugin_customization.ini
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/pom.xml
similarity index 91%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/pom.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/pom.xml
index 6b1ca89..78cd5f5 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.product/pom.xml
@@ -4,12 +4,12 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.releng</artifactId>
+		<artifactId>${fullartifactId}.releng</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>
-	<artifactId>${groupId}.${artifactId}.product</artifactId>
+	<artifactId>${fullartifactId}.product</artifactId>
 	<packaging>eclipse-repository</packaging>
-	<name>${groupId}.${artifactId}.product</name>
+	<name>${fullartifactId}.product</name>
 	<description>This plugins defines the product used in the RCP ${componentName}.</description>
 	<properties>
 		<product-id>${groupId}.product</product-id>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/build.properties b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/build.properties
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/build.properties
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/build.properties
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/epl-v10.html b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/epl-v10.html
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/epl-v10.html
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/epl-v10.html
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/feature.properties b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/feature.properties
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/feature.properties
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/feature.properties
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/feature.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/feature.xml
similarity index 89%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/feature.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/feature.xml
index 1ba6eb6..87f08de 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/feature.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="${groupId}.${artifactId}.rcp.feature"
+      id="${fullartifactId}.rcp.feature"
       label="%featureName"
       version="${version}.qualifier"
       provider-name="%providerName">
@@ -22,7 +22,7 @@
    </license>
 
    <plugin
-         id="${groupId}.${artifactId}.rcp"
+         id="${fullartifactId}.rcp"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/license.html b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/license.html
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/license.html
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/license.html
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/pom.xml
similarity index 75%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/pom.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/pom.xml
index 4b6ed76..38fa2a9 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp.feature/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp.feature/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.releng</artifactId>
+		<artifactId>${fullartifactId}.releng</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>
-	<artifactId>${groupId}.${artifactId}.rcp.feature</artifactId>
+	<artifactId>${fullartifactId}.rcp.feature</artifactId>
 	<packaging>eclipse-feature</packaging>
-	<name>${groupId}.${artifactId}.rcp.feature</name>
+	<name>${fullartifactId}.rcp.feature</name>
 	<description>This plugin packages the rcp in a feature to be used as it in the ${componentName} product.</description>
 </project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/META-INF/MANIFEST.MF b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/META-INF/MANIFEST.MF
similarity index 84%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/META-INF/MANIFEST.MF
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/META-INF/MANIFEST.MF
index 725ebfd..6edf8f8 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/META-INF/MANIFEST.MF
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: ${groupId}.${artifactId}.rcp;singleton:=true
+Bundle-SymbolicName: ${fullartifactId}.rcp;singleton:=true
 Bundle-Version: ${version}.qualifier
 Bundle-Vendor: %pluginProvider
 Bundle-ActivationPolicy: lazy
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/build.properties b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/build.properties
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/build.properties
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/build.properties
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/icon.xpm b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/icon.xpm
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/icon.xpm
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/icon.xpm
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus.icns b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus.icns
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus.icns
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus.icns
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus.ico b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus.ico
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus.ico
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus.ico
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus.svg b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus.svg
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus.svg
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus.svg
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus128.png b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus128.png
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus128.png
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus128.png
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus16.png b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus16.png
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus16.png
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus16.png
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus256.png b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus256.png
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus256.png
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus256.png
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus32.png b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus32.png
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus32.png
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus32.png
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus48.png b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus48.png
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus48.png
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus48.png
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus64.png b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus64.png
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus64.png
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus64.png
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus_lg.png b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus_lg.png
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/papyrus_lg.png
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/papyrus_lg.png
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/splash.svg b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/splash.svg
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/icons/splash.svg
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/icons/splash.svg
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/plugin.properties b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/plugin.properties
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/plugin.properties
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/plugin.properties
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/plugin.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/plugin.xml
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/plugin.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/plugin.xml
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/plugin_customization.ini b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/plugin_customization.ini
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/plugin_customization.ini
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/plugin_customization.ini
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/pom.xml
similarity index 77%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/pom.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/pom.xml
index 6e3c41a..6110cb0 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.releng</artifactId>
+		<artifactId>${fullartifactId}.releng</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>
-	<artifactId>${groupId}.${artifactId}.rcp</artifactId>
+	<artifactId>${fullartifactId}.rcp</artifactId>
 	<packaging>eclipse-plugin</packaging>
-	<name>${groupId}.${artifactId}.rcp</name>
+	<name>${fullartifactId}.rcp</name>
 	<description>This plugins defines the Rich Client Platform for ${componentName} application.</description>
 </project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/splash.bmp b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/splash.bmp
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.rcp/splash.bmp
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__fullartifactId__.rcp/splash.bmp
Binary files differ
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/category.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/category.xml
deleted file mode 100644
index da5ca37..0000000
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.p2/category.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-	<feature id="${groupId}.feature" url="features/${groupId}.${artifactId}.feature_${version}.qualifier.jar" version="${version}.qualifier">
-		<category name="org.eclipse.papyrus.category"/>
-	</feature>
-	<feature id="${groupId}.feature.source" url="features/${groupId}.${artifactId}.feature.source_${version}.qualifier.jar" version="${version}.qualifier">
-		<category name="org.eclipse.papyrus.category"/>
-	</feature>
-	<category-def label="Papyrus ${componentName} Category" name="org.eclipse.papyrus.category">
-		<description>Papyrus ${componentName} Category</description>
-	</category-def>
-</site>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/category.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/category.xml
deleted file mode 100644
index 80f8b08..0000000
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/__groupId__.__artifactId__.product/category.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/${groupId}.${artifactId}.feature_${version}.qualifier.jar" id="${groupId}.${artifactId}.feature" version="${version}.qualifier"/>
-</site>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/pom.xml
index 23d10cf..243d65f 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/releng/pom.xml
@@ -4,15 +4,15 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.parent</artifactId>
+		<artifactId>${fullartifactId}.parent</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>
-	<artifactId>${groupId}.${artifactId}.releng</artifactId>
+	<artifactId>${fullartifactId}.releng</artifactId>
 	<packaging>pom</packaging>
 	<name>${componentName} Releng</name>
 	<description>This plug-in contains the different modules relatives to the releng of ${componentName} from update site, to feature , product and rcp.</description>
 	<modules>
-		<module>${groupId}.${artifactId}.feature</module>
+		<module>${fullartifactId}.feature</module>
 	</modules>
 
 	<profiles>
@@ -22,10 +22,10 @@
 				<activeByDefault>false</activeByDefault>
 			</activation>
 			<modules>
-				<module>${groupId}.${artifactId}.p2</module>
-				<module>${groupId}.${artifactId}.rcp</module>
-				<module>${groupId}.${artifactId}.rcp.feature</module>
-				<module>${groupId}.${artifactId}.product</module>
+				<module>${fullartifactId}.p2</module>
+				<module>${fullartifactId}.rcp</module>
+				<module>${fullartifactId}.rcp.feature</module>
+				<module>${fullartifactId}.product</module>
 			</modules>
 		</profile>
 	</profiles>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/etc/header.epl.txt b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/src/etc/header.epl.txt
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/etc/header.epl.txt
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/src/etc/header.epl.txt
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly.target b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon-papyrusnightly/__fullartifactId__.targetplatform.neon-papyrusnightly.target
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly.target
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon-papyrusnightly/__fullartifactId__.targetplatform.neon-papyrusnightly.target
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly.tpd b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon-papyrusnightly/__fullartifactId__.targetplatform.neon-papyrusnightly.tpd
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly.tpd
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon-papyrusnightly/__fullartifactId__.targetplatform.neon-papyrusnightly.tpd
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon-papyrusnightly/pom.xml
similarity index 71%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly/pom.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon-papyrusnightly/pom.xml
index 5c5da99..085f7a2 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon-papyrusnightly/pom.xml
@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.targetplatform</artifactId>
+		<artifactId>${fullartifactId}.targetplatform</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>
-	<artifactId>${groupId}.${artifactId}.targetplatform.neon-papyrusnightly</artifactId>
+	<artifactId>${fullartifactId}.targetplatform.neon-papyrusnightly</artifactId>
 	<packaging>eclipse-target-definition</packaging>
-	<name>${groupId}.${artifactId}.targetplatform.neon-papyrusnightly</name>
+	<name>${fullartifactId}.targetplatform.neon-papyrusnightly</name>
 	<description>This plug-in contains the target definition for Papyrus ${componentName} in Neon with Papyrus nightly.</description>
 </project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly/target.file b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon-papyrusnightly/target.file
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon-papyrusnightly/target.file
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon-papyrusnightly/target.file
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon/__groupId__.__artifactId__.targetplatform.neon.target b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon/__fullartifactId__.targetplatform.neon.target
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon/__groupId__.__artifactId__.targetplatform.neon.target
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon/__fullartifactId__.targetplatform.neon.target
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon/__groupId__.__artifactId__.targetplatform.neon.tpd b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon/__fullartifactId__.targetplatform.neon.tpd
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon/__groupId__.__artifactId__.targetplatform.neon.tpd
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon/__fullartifactId__.targetplatform.neon.tpd
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon/pom.xml
similarity index 73%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon/pom.xml
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon/pom.xml
index eddba37..659cb23 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon/pom.xml
@@ -3,11 +3,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.targetplatform</artifactId>
+		<artifactId>${fullartifactId}.targetplatform</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>	
-	<artifactId>${groupId}.${artifactId}.targetplatform.neon</artifactId>
+	<artifactId>${fullartifactId}.targetplatform.neon</artifactId>
 	<packaging>eclipse-target-definition</packaging>
-	<name>${groupId}.${artifactId}.targetplatform.neon</name>
+	<name>${fullartifactId}.targetplatform.neon</name>
 	<description>This plug-in contains the target definition for Papyrus ${componentName} in Neon.</description>
 </project>
\ No newline at end of file
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon/target.file b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon/target.file
similarity index 100%
rename from components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__groupId__.__artifactId__.targetplatform.neon/target.file
rename to components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/__fullartifactId__.targetplatform.neon/target.file
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/pom.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/pom.xml
index cfbca47..9943d91 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/main/resources/archetype-resources/targetplatform/pom.xml
@@ -4,10 +4,10 @@
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>${groupId}</groupId>
-		<artifactId>${groupId}.${artifactId}.parent</artifactId>
+		<artifactId>${fullartifactId}.parent</artifactId>
 		<version>${version}-SNAPSHOT</version>
 	</parent>
-	<artifactId>${groupId}.${artifactId}.targetplatform</artifactId>
+	<artifactId>${fullartifactId}.targetplatform</artifactId>
 	<packaging>pom</packaging>
 	<name>Target Platform</name>
 	<description>This module contains the different Eclipse target platform definitions.</description>
@@ -18,7 +18,7 @@
 				<activeByDefault>true</activeByDefault>
 			</activation>
 			<modules>
-				<module>${groupId}.${artifactId}.targetplatform.neon</module>
+				<module>${fullartifactId}.targetplatform.neon</module>
 			</modules>
 		</profile>
 		<profile>
@@ -30,7 +30,7 @@
 				</property>
 			</activation>
 			<modules>
-				<module>${groupId}.${artifactId}.neon-papyrusnightly</module>
+				<module>${fullartifactId}.neon-papyrusnightly</module>
 			</modules>
 		</profile>
 	</profiles>
diff --git a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/site/xdoc/user/sop-projectcreation.xml b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/site/xdoc/user/sop-projectcreation.xml
index c5d077e..6ba2114 100644
--- a/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/site/xdoc/user/sop-projectcreation.xml
+++ b/components/org.eclipse.papyrus.components.parent/org.eclipse.papyrus.components.archetype/src/site/xdoc/user/sop-projectcreation.xml
@@ -20,8 +20,9 @@
 				<p>Where the following args are defined:</p>
 				<ul>
 					<li>mvn archetype:generate -DarchetypeGroupId=org.eclipse.papyrus.components -DarchetypeArtifactId=org.eclipse.papyrus.components.archetype -DarchetypeVersion=0.0.1: describe the version of the archetype you are using</li>
-					<li>-DgroupId=org.eclipse.papyrus.mycomponent -DartifactId=mycomponent -Dversion=0.0.1: the basic triplet for your compoennt</li>
-					<li>-DcomponentName=mycomponent: the name of your component that will serve as a basis to uild the root package anme: org.eclipse.papyrus.component.componentName</li>
+					<li>-DgroupId=org.eclipse.papyrus.mosa -DartifactId=mycomponent -Dversion=0.0.1: the basic triplet for your component</li>
+					<li>-DfullartifactId=org.eclipse.papyrus.mosa.security</li>
+					<li>-DcomponentName=Mycomponent: the name of your component that will serve as a basis to uild the root package anme: org.eclipse.papyrus.component.componentName</li>
 					<li>-DhudsonViewName=HUDSON: the Hudson tab name</li>
 					<li>-DbugzillaName=BUGZILLA: the compoennt name in bugzilla</li>
 				</ul>
diff --git a/components/org.eclipse.papyrus.components.parent/pom.xml b/components/org.eclipse.papyrus.components.parent/pom.xml
index 662fe27..c7d9b87 100644
--- a/components/org.eclipse.papyrus.components.parent/pom.xml
+++ b/components/org.eclipse.papyrus.components.parent/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.papyrus.components</groupId>
 	<artifactId>org.eclipse.papyrus.components.parent</artifactId>
-	<version>0.0.13</version>
+	<version>0.0.14</version>
 	<packaging>pom</packaging>
 	<name>Papyrus Shared Components Descriptor</name>
 	<description>This pom is the main parent pom for all Papyrus Components. It gather all shared configuration and properties, ensuring all components benefit from any evolution.</description>
@@ -313,7 +313,7 @@
 						</runner>
 	
 						<aut>
-							<explicit>../${component.package.rootname}.${component.shortname}.product/target/products/${component.package.rootname}.${component.shortname}.product-[platform].zip</explicit>
+							<explicit>../${component.fullartifactId}.product/target/products/${component.fullartifactId}.product-[platform].zip</explicit>
 							<!-- reuseExistingWorkspace>false</reuseExistingWorkspace -->
 							
 							<args>
@@ -520,7 +520,7 @@
 					<target>
 						<artifact>
 							<groupId>${component.package.rootname}</groupId>
-							<artifactId>${component.package.rootname}.${component.artifactId}.targetplatform.${eclipse.targetrelease}</artifactId>
+							<artifactId>${component.fullartifactId}.targetplatform.${eclipse.targetrelease}</artifactId>
 							<version>${target.version}</version>
 						</artifact>
 					</target>