diff --git a/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/.project b/layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project
similarity index 72%
rename from layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/.project
rename to layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project
index 6427d98..9ae9b2a 100755
--- a/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/.project
+++ b/layers/releng/org.eclipse.papyrus.incubation.layers.p2/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2</name>
+	<name>org.eclipse.papyrus.incubation.layers.p2</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/category.xml b/layers/releng/org.eclipse.papyrus.incubation.layers.p2/category.xml
similarity index 100%
rename from layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/category.xml
rename to layers/releng/org.eclipse.papyrus.incubation.layers.p2/category.xml
diff --git a/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/pom.xml b/layers/releng/org.eclipse.papyrus.incubation.layers.p2/pom.xml
similarity index 90%
rename from layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/pom.xml
rename to layers/releng/org.eclipse.papyrus.incubation.layers.p2/pom.xml
index b8ca8a3..36a7325 100755
--- a/layers/releng/org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2/pom.xml
+++ b/layers/releng/org.eclipse.papyrus.incubation.layers.p2/pom.xml
@@ -9,7 +9,7 @@
 		<version>0.7.0-SNAPSHOT</version>
 	</parent>
 	
-	<artifactId>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2</artifactId>
+	<artifactId>org.eclipse.papyrus.incubation.layers.p2</artifactId>
 	<packaging>eclipse-repository</packaging>
 	
 	<build>
diff --git a/layers/releng/pom.xml b/layers/releng/pom.xml
index ee4a7a3..70ad251 100755
--- a/layers/releng/pom.xml
+++ b/layers/releng/pom.xml
@@ -13,7 +13,7 @@
 	
 	<modules>
 		<module>targetplatform</module>
-		<module>org.eclipse.papyrus.incubation.infra.gmfdiag.layers.p2</module>
+		<module>org.eclipse.papyrus.incubation.layers.p2</module>
 	</modules>	
 	
 </project>
\ No newline at end of file
diff --git a/layers/releng/promote/layers.sh b/layers/releng/promote/layers.sh
index b9dc063..cad7f81 100755
--- a/layers/releng/promote/layers.sh
+++ b/layers/releng/promote/layers.sh
@@ -39,7 +39,7 @@
 #if [ $# -eq 6 -o $# -eq 7  ];
 #then
 #	jobName=$1
-jobName="Papyrus-Incubation-DsmlValidation"
+jobName="Papyrus-Incubation-Layers"
 	echo "jobName: $jobName"
 #	buildNumber=$2
 buildNumber="4"
@@ -164,7 +164,7 @@
 then
 	if [ -d $destination ];
 	then
-		echo "Overriding the RCP by cleaning the $destination folder"
+		echo "Overriding by cleaning the $destination folder"
 		rm -rf ${destination}/*
 	fi
 fi
diff --git a/releng/org.eclipse.papyrus.incubation.p2/category.xml b/releng/org.eclipse.papyrus.incubation.p2/category.xml
index 4e09985..acf6a6f 100755
--- a/releng/org.eclipse.papyrus.incubation.p2/category.xml
+++ b/releng/org.eclipse.papyrus.incubation.p2/category.xml
@@ -21,10 +21,10 @@
       <category name="org.eclipse.papyrus.incubation.category"/>
    </feature>
    
-   <feature url="features/org.eclipse.papyrus.layers.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.layers.feature" version="1.2.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.infra.gmfdiag.layers.feature_0.7.0.qualifier.jar" id="org.eclipse.papyrus.infra.gmfdiag.layers.feature" version="0.7.0.qualifier">
       <category name="org.eclipse.papyrus.incubation.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.layers.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.layers.feature.source" version="1.2.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.infra.gmfdiag.layers.feature.source_0.7.0.qualifier.jar" id="org.eclipse.papyrus.infra.gmfdiag.layers.feature.source" version="0.7.0.qualifier">
       <category name="org.eclipse.papyrus.incubation.category"/>
    </feature>