diff --git a/aspectj/project.xml b/aspectj/project.xml
index 7b56e3a7..e097934d 100644
--- a/aspectj/project.xml
+++ b/aspectj/project.xml
@@ -15,6 +15,16 @@
     <url>http://cvs.apache.org/viewcvs/maven/src/plugins-build/aspectj/</url>
   </repository>
   <developers>
+    <developer>
+      <name>Vincent Massol</name>
+      <id>vmassol</id>
+      <email>vmassol@pivolis.com</email>
+      <organization>Pivolis</organization>
+      <roles>
+        <role>Creator</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>dIon Gillard</name>
       <id>dion</id>
@@ -24,15 +34,6 @@
         <role>Documentation</role>
       </roles>
     </developer>
-    <developer>
-      <name>Vincent Massol</name>
-      <id>vmassol</id>
-      <email>vmassol@octo.com</email>
-      <organization>Octo Technology</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
     <developer>
       <name>Pete Kazmier</name>
       <id>kaz</id>
diff --git a/cactus/project.xml b/cactus/project.xml
index a8cf10f9..e1e38f7e 100644
--- a/cactus/project.xml
+++ b/cactus/project.xml
@@ -53,8 +53,8 @@
       <email>vmassol@pivolis.com</email>
       <organization>Pivolis</organization>
       <roles>
+        <role>Creator</role>
         <role>Java Developer</role>
-        <role>Architect</role>
         <role>Release Manager</role>
       </roles>
     </developer>
diff --git a/changes/project.xml b/changes/project.xml
index 2848bfd9..137852e4 100644
--- a/changes/project.xml
+++ b/changes/project.xml
@@ -27,6 +27,7 @@
       <email>vmassol@pivolis.com</email>
       <organization>Pivolis</organization>
       <roles>
+        <role>Creator</role>
         <role>Java Developer</role>
       </roles>
     </developer>
diff --git a/clover/project.xml b/clover/project.xml
index f3816c4d..868ad6b5 100644
--- a/clover/project.xml
+++ b/clover/project.xml
@@ -22,6 +22,16 @@
     </version>
   </versions>
   <developers>
+    <developer>
+      <name>Vincent Massol</name>
+      <id>vmassol</id>
+      <email>vmassol@pivolis.com</email>
+      <organization>Pivolis</organization>
+      <roles>
+        <role>Creator</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>dIon Gillard</name>
       <id>dion</id>
@@ -40,15 +50,6 @@
         <role>Java Developer</role>
       </roles>
     </developer>
-    <developer>
-      <name>Vincent Massol</name>
-      <id>vmassol</id>
-      <email>vmassol@pivolis.com</email>
-      <organization>Pivolis</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
     <developer>
       <name>Stéphane Mor</name>
       <id>smor</id>
@@ -73,8 +74,7 @@
       <email>jason@zenplex.com</email>
       <organization>Zenplex</organization>
       <roles>
-        <role>Architect</role>
-        <role>Release Manager</role>
+        <role>Java Developer</role>
       </roles>
     </developer>
   </developers>
diff --git a/ear/project.xml b/ear/project.xml
index 9889d069..6f15ad84 100644
--- a/ear/project.xml
+++ b/ear/project.xml
@@ -24,6 +24,16 @@
     </version>
   </versions>
   <developers>
+    <developer>
+      <name>Vincent Massol</name>
+      <id>vmassol</id>
+      <email>vmassol@pivolis.com</email>
+      <organization>Pivolis</organization>
+      <roles>
+        <role>Creator</role>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
     <developer>
       <name>Nathan Coast</name>
       <id>nathan</id>
@@ -51,15 +61,6 @@
         <role>Java Developer</role>
       </roles>
     </developer>
-    <developer>
-      <name>Vincent Massol</name>
-      <id>vmassol</id>
-      <email>vmassol@pivolis.com</email>
-      <organization>Pivolis</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
   </developers>
 
   <dependencies>
@@ -69,14 +70,12 @@
       <version>20030211.142705</version>
       <url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
     </dependency>
-
     <dependency>
       <groupId>commons-jelly</groupId>
       <artifactId>commons-jelly-tags-util</artifactId>
       <version>20030211.141939</version>
       <url>http://jakarta.apache.org/commons/jelly/tags/util/</url>
     </dependency>
-
   </dependencies>
   
   <reports>
diff --git a/eclipse/project.xml b/eclipse/project.xml
index e1d01c53..fc302178 100644
--- a/eclipse/project.xml
+++ b/eclipse/project.xml
@@ -18,9 +18,10 @@
     <developer>
       <name>Vincent Massol</name>
       <id>vmassol</id>
-      <email>vmassol@octo.com</email>
-      <organization>Octo Technology</organization>
+      <email>vmassol@pivolis.com</email>
+      <organization>Pivolis</organization>
       <roles>
+        <role>Creator</role>
         <role>Java Developer</role>
       </roles>
     </developer>
diff --git a/jboss/project.xml b/jboss/project.xml
index bf03af13..83524167 100644
--- a/jboss/project.xml
+++ b/jboss/project.xml
@@ -47,6 +47,7 @@
       <email>vmassol@pivolis.com</email>
       <organization>Pivolis</organization>
       <roles>
+        <role>Creator</role>
         <role>Java Developer</role>
         <role>Release Manager</role>
       </roles>
diff --git a/statcvs/project.xml b/statcvs/project.xml
index 3807644a..cc808f0b 100644
--- a/statcvs/project.xml
+++ b/statcvs/project.xml
@@ -30,6 +30,17 @@
     </version>
   </versions>
   <developers>
+    <developer>
+      <name>Vincent Massol</name>
+      <id>vmassol</id>
+      <email>vmassol@pivolis.com</email>
+      <organization>Pivolis</organization>
+      <roles>
+        <role>Creator</role>
+        <role>Java Developer</role>
+        <role>Release Manager</role>
+      </roles>
+    </developer>
     <developer>
       <name>dIon Gillard</name>
       <id>dion</id>
@@ -48,15 +59,6 @@
         <role>Java Developer</role>
       </roles>
     </developer>
-    <developer>
-      <name>Vincent Massol</name>
-      <id>vmassol</id>
-      <email>vmassol@pivolis.com</email>
-      <organization>Pivolis</organization>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-    </developer>
   </developers>
   <contributors>
     <contributor>