diff --git a/component/application-registry/pom.xml b/component/application-registry/pom.xml
index 35d3082ff..e8ae100e6 100644
--- a/component/application-registry/pom.xml
+++ b/component/application-registry/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -43,7 +43,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.portal</artifactId>
     </dependency>
     
@@ -58,26 +58,26 @@
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.jcr</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.identity</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.portal</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/component/common/pom.xml b/component/common/pom.xml
index dfbe8b53d..09fcd7fa5 100644
--- a/component/common/pom.xml
+++ b/component/common/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -74,13 +74,13 @@
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.jcr</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/component/identity/pom.xml b/component/identity/pom.xml
index fd92fdfd6..71bf388a7 100644
--- a/component/identity/pom.xml
+++ b/component/identity/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
@@ -49,7 +49,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.common</artifactId>
     </dependency>
 
@@ -81,7 +81,7 @@
         <scope>test</scope>
      </dependency>
      <dependency>
-       <groupId>org.exoplatform.portal</groupId>
+       <groupId>org.gatein.portal</groupId>
        <artifactId>exo.portal.component.test.core</artifactId>
        <scope>test</scope>
      </dependency>
diff --git a/component/management/pom.xml b/component/management/pom.xml
index 4f35212ab..2c4489190 100644
--- a/component/management/pom.xml
+++ b/component/management/pom.xml
@@ -19,7 +19,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -32,7 +32,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.portal</artifactId>
     </dependency>
     <dependency>
diff --git a/component/pc/pom.xml b/component/pc/pom.xml
index b501eb399..8919c24fa 100644
--- a/component/pc/pom.xml
+++ b/component/pc/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -34,7 +34,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.resources</artifactId>
     </dependency>
     <dependency>
diff --git a/component/pom.xml b/component/pom.xml
index bf4f55fb3..c1e34e1c6 100644
--- a/component/pom.xml
+++ b/component/pom.xml
@@ -24,7 +24,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.parent</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/component/portal/pom.xml b/component/portal/pom.xml
index 4c21288fb..cf22ba9c2 100644
--- a/component/portal/pom.xml
+++ b/component/portal/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -44,17 +44,17 @@
     </dependency>
     
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.common</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.pc</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.identity</artifactId>
     </dependency>
 
@@ -101,19 +101,19 @@
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.jcr</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.identity</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/component/resources/pom.xml b/component/resources/pom.xml
index 10ba2d114..0e22fa727 100644
--- a/component/resources/pom.xml
+++ b/component/resources/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -48,11 +48,11 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/component/scripting/pom.xml b/component/scripting/pom.xml
index 1c6263760..919b8f19e 100644
--- a/component/scripting/pom.xml
+++ b/component/scripting/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -39,7 +39,7 @@
     </dependency>
     
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.common</artifactId>
     </dependency>
 
@@ -49,7 +49,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/component/test/core/pom.xml b/component/test/core/pom.xml
index 0173d3fbd..574a82980 100644
--- a/component/test/core/pom.xml
+++ b/component/test/core/pom.xml
@@ -20,7 +20,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component.test</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
diff --git a/component/test/jcr/pom.xml b/component/test/jcr/pom.xml
index 42e1814d7..ccd35451d 100644
--- a/component/test/jcr/pom.xml
+++ b/component/test/jcr/pom.xml
@@ -20,7 +20,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component.test</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -33,7 +33,7 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
     </dependency>
 
diff --git a/component/test/pom.xml b/component/test/pom.xml
index efa1d2d2c..6f359ac26 100644
--- a/component/test/pom.xml
+++ b/component/test/pom.xml
@@ -20,7 +20,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
    <parent>
-     <groupId>org.exoplatform.portal</groupId>
+     <groupId>org.gatein.portal</groupId>
      <artifactId>exo.portal.component</artifactId>
      <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/component/test/web/pom.xml b/component/test/web/pom.xml
index 4f665c6ea..28571807a 100644
--- a/component/test/web/pom.xml
+++ b/component/test/web/pom.xml
@@ -20,7 +20,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component.test</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
diff --git a/component/web/api/pom.xml b/component/web/api/pom.xml
index d57117a7d..992e8b00a 100644
--- a/component/web/api/pom.xml
+++ b/component/web/api/pom.xml
@@ -19,7 +19,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component.web</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -40,11 +40,11 @@
       <artifactId>exo.kernel.container</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.controller</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/component/web/controller/pom.xml b/component/web/controller/pom.xml
index 0f23eebbc..ba691c6f7 100644
--- a/component/web/controller/pom.xml
+++ b/component/web/controller/pom.xml
@@ -19,7 +19,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component.web</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -42,7 +42,7 @@
         <artifactId>exo.kernel.container</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.portal</artifactId>
     </dependency>
 
@@ -61,7 +61,7 @@
     </dependency>
 -->
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
@@ -71,20 +71,20 @@
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.jcr</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.identity</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.portal</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/component/web/pom.xml b/component/web/pom.xml
index 2e1408ebb..e8bed1766 100644
--- a/component/web/pom.xml
+++ b/component/web/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
diff --git a/component/web/resources/pom.xml b/component/web/resources/pom.xml
index 9ad4c19e6..7495c924b 100644
--- a/component/web/resources/pom.xml
+++ b/component/web/resources/pom.xml
@@ -19,7 +19,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component.web</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -38,11 +38,11 @@
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.resources</artifactId>
     </dependency>
     <dependency>
@@ -58,16 +58,16 @@
       <artifactId>closure-compiler</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.controller</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.web</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/component/web/resources/src/main/java/org/gatein/portal/controller/resource/ResourceRequestHandler.java b/component/web/resources/src/main/java/org/gatein/portal/controller/resource/ResourceRequestHandler.java
index 6a6d82129..0631ea204 100644
--- a/component/web/resources/src/main/java/org/gatein/portal/controller/resource/ResourceRequestHandler.java
+++ b/component/web/resources/src/main/java/org/gatein/portal/controller/resource/ResourceRequestHandler.java
@@ -52,7 +52,7 @@ public class ResourceRequestHandler extends WebRequestHandler
    public static final String LAST_MODIFIED     = "Last-Modified";
    
    /** . */
-   private static String PATH = "META-INF/maven/org.exoplatform.portal/exo.portal.component.web.resources/pom.properties";
+   private static String PATH = "META-INF/maven/org.gatein.portal/exo.portal.component.web.resources/pom.properties";
 
    /** . */
    private static final Logger log = LoggerFactory.getLogger(ResourceRequestHandler.class);
diff --git a/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java b/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java
index d2c64b119..7af92b6a3 100644
--- a/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java
+++ b/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java
@@ -47,7 +47,7 @@
 @ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-configuration.xml")})
 public abstract class AbstractSkinServiceTest extends AbstractKernelTest
 {
-   // The value must be the same with the version property in META-INF/maven/org.exoplatform.portal/exo.portal.component.web.resources/pom.properties
+   // The value must be the same with the version property in META-INF/maven/org.gatein.portal/exo.portal.component.web.resources/pom.properties
    protected final static String ASSETS_VERSION = "PORTAL-VERSION";
    
    protected SkinService skinService;
diff --git a/component/web/resources/src/test/resources/META-INF/maven/org.exoplatform.portal/exo.portal.component.web.resources/pom.properties b/component/web/resources/src/test/resources/META-INF/maven/org.gatein.portal/exo.portal.component.web.resources/pom.properties
similarity index 100%
rename from component/web/resources/src/test/resources/META-INF/maven/org.exoplatform.portal/exo.portal.component.web.resources/pom.properties
rename to component/web/resources/src/test/resources/META-INF/maven/org.gatein.portal/exo.portal.component.web.resources/pom.properties
diff --git a/component/web/security/pom.xml b/component/web/security/pom.xml
index 0c0fd511a..a7c20dfcc 100644
--- a/component/web/security/pom.xml
+++ b/component/web/security/pom.xml
@@ -19,7 +19,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component.web</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -47,11 +47,11 @@
       </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.controller</artifactId>
     </dependency>
     <dependency>
@@ -64,12 +64,12 @@
        <artifactId>simplecaptcha</artifactId>
      </dependency>
      <dependency>
-       <groupId>org.exoplatform.portal</groupId>
+       <groupId>org.gatein.portal</groupId>
        <artifactId>exo.portal.component.test.core</artifactId>
        <scope>test</scope>
      </dependency>
      <dependency>
-       <groupId>org.exoplatform.portal</groupId>
+       <groupId>org.gatein.portal</groupId>
        <artifactId>exo.portal.component.test.jcr</artifactId>
        <scope>test</scope>
      </dependency>
diff --git a/component/web/server/pom.xml b/component/web/server/pom.xml
index 21972473f..00e259071 100644
--- a/component/web/server/pom.xml
+++ b/component/web/server/pom.xml
@@ -19,7 +19,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.component.web</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -36,11 +36,11 @@
       <artifactId>exo.kernel.container</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.controller</artifactId>
     </dependency>
     <dependency>
diff --git a/docs/pom.xml b/docs/pom.xml
index 300b11cf4..acfe381ba 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -23,7 +23,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.parent</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/examples/extension/config/pom.xml b/examples/extension/config/pom.xml
index 08e78d73c..480743843 100644
--- a/examples/extension/config/pom.xml
+++ b/examples/extension/config/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
diff --git a/examples/extension/ear/pom.xml b/examples/extension/ear/pom.xml
index 3b431e12e..bfca5a976 100644
--- a/examples/extension/ear/pom.xml
+++ b/examples/extension/ear/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
@@ -36,23 +36,23 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.sample.extension.config</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.sample.extension.jar</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.api</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.sample.extension.war</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
       <type>war</type>
@@ -67,18 +67,18 @@
         <configuration>
            <modules>
              <jarModule>
-               <groupId>org.exoplatform.portal</groupId>
+               <groupId>org.gatein.portal</groupId>
                <artifactId>exo.portal.sample.extension.config</artifactId>
                <includeInApplicationXml>true</includeInApplicationXml>
              </jarModule>
              <webModule>
-               <groupId>org.exoplatform.portal</groupId>
+               <groupId>org.gatein.portal</groupId>
                <artifactId>exo.portal.sample.extension.war</artifactId>
                <bundleFileName>sample-ext.war</bundleFileName>
                <contextRoot>sample-ext</contextRoot>
              </webModule>
              <jarModule>
-               <groupId>org.exoplatform.portal</groupId>
+               <groupId>org.gatein.portal</groupId>
                <artifactId>exo.portal.sample.extension.jar</artifactId>
                <includeInApplicationXml>true</includeInApplicationXml>
              </jarModule>
diff --git a/examples/extension/jar/pom.xml b/examples/extension/jar/pom.xml
index 7ce97cef4..3e8ba5cc1 100644
--- a/examples/extension/jar/pom.xml
+++ b/examples/extension/jar/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.api</artifactId>
     </dependency>
   </dependencies>
diff --git a/examples/extension/pom.xml b/examples/extension/pom.xml
index a3d31c6ae..bf185a74b 100644
--- a/examples/extension/pom.xml
+++ b/examples/extension/pom.xml
@@ -22,7 +22,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
diff --git a/examples/extension/war/pom.xml b/examples/extension/war/pom.xml
index a783c42b4..23ba39a6b 100644
--- a/examples/extension/war/pom.xml
+++ b/examples/extension/war/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
diff --git a/examples/pom.xml b/examples/pom.xml
index 768d63830..e65a2b6db 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,7 +24,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.parent</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/examples/portal/config/pom.xml b/examples/portal/config/pom.xml
index 8cd784a5c..1d9e601f0 100644
--- a/examples/portal/config/pom.xml
+++ b/examples/portal/config/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
diff --git a/examples/portal/ear/pom.xml b/examples/portal/ear/pom.xml
index 3f0bf5c9f..f2c3f729a 100644
--- a/examples/portal/ear/pom.xml
+++ b/examples/portal/ear/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
@@ -36,29 +36,29 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.sample.portal.config</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.sample.portal.jar</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.api</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.sample.portal.war</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.sample.portal.rest-war</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
       <type>war</type>
@@ -74,24 +74,24 @@
            <displayName>sample-portal</displayName>
            <modules>
              <jarModule>
-               <groupId>org.exoplatform.portal</groupId>
+               <groupId>org.gatein.portal</groupId>
                <artifactId>exo.portal.sample.portal.config</artifactId>
                <includeInApplicationXml>true</includeInApplicationXml>
              </jarModule>
              <webModule>
-               <groupId>org.exoplatform.portal</groupId>
+               <groupId>org.gatein.portal</groupId>
                <artifactId>exo.portal.sample.portal.war</artifactId>
                <bundleFileName>sample-portal.war</bundleFileName>
                <contextRoot>sample-portal</contextRoot>
              </webModule>
              <webModule>
-               <groupId>org.exoplatform.portal</groupId>
+               <groupId>org.gatein.portal</groupId>
                <artifactId>exo.portal.sample.portal.rest-war</artifactId>
                <bundleFileName>rest-sample-portal.war</bundleFileName>
                <contextRoot>rest-sample-portal</contextRoot>
              </webModule>
              <jarModule>
-               <groupId>org.exoplatform.portal</groupId>
+               <groupId>org.gatein.portal</groupId>
                <artifactId>exo.portal.sample.portal.jar</artifactId>
                <includeInApplicationXml>true</includeInApplicationXml>
              </jarModule>
diff --git a/examples/portal/jar/pom.xml b/examples/portal/jar/pom.xml
index 3bf4a5cc1..0bc624aeb 100644
--- a/examples/portal/jar/pom.xml
+++ b/examples/portal/jar/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.api</artifactId>
     </dependency>
   </dependencies>
diff --git a/examples/portal/pom.xml b/examples/portal/pom.xml
index 9ceb196ff..0e060436f 100644
--- a/examples/portal/pom.xml
+++ b/examples/portal/pom.xml
@@ -22,7 +22,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
diff --git a/examples/portal/rest-war/pom.xml b/examples/portal/rest-war/pom.xml
index 17b471a3e..f6e8e7db7 100644
--- a/examples/portal/rest-war/pom.xml
+++ b/examples/portal/rest-war/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
diff --git a/examples/portal/war/pom.xml b/examples/portal/war/pom.xml
index aaa93f6fd..7b9d8d5aa 100644
--- a/examples/portal/war/pom.xml
+++ b/examples/portal/war/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../../pom.xml</relativePath>
diff --git a/examples/portlets/pom.xml b/examples/portlets/pom.xml
index f62a71235..dbbea40ab 100644
--- a/examples/portlets/pom.xml
+++ b/examples/portlets/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.parent</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
diff --git a/examples/skins/pom.xml b/examples/skins/pom.xml
index 21343b0b9..3fb6886f8 100644
--- a/examples/skins/pom.xml
+++ b/examples/skins/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.parent</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
       <relativePath>../../pom.xml</relativePath>
diff --git a/gadgets/core/pom.xml b/gadgets/core/pom.xml
index fccf60208..d7dc17193 100644
--- a/gadgets/core/pom.xml
+++ b/gadgets/core/pom.xml
@@ -12,7 +12,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.gadgets</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
@@ -89,15 +89,15 @@
    </build>
    <dependencies>
      <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.common</artifactId>
      </dependency>
      <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.web.controller</artifactId>
      </dependency>
      <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.web.security</artifactId>
      </dependency>
      <dependency>
@@ -131,19 +131,19 @@
          <artifactId>chromattic.spi</artifactId>
       </dependency>
       <dependency>
-        <groupId>org.exoplatform.portal</groupId>
+        <groupId>org.gatein.portal</groupId>
         <artifactId>exo.portal.component.web.security</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.exoplatform.portal</groupId>
+        <groupId>org.gatein.portal</groupId>
         <artifactId>exo.portal.component.test.core</artifactId>
         <scope>test</scope>
       </dependency>
       <dependency>
-        <groupId>org.exoplatform.portal</groupId>
+        <groupId>org.gatein.portal</groupId>
         <artifactId>exo.portal.component.test.jcr</artifactId>
         <scope>test</scope>
       </dependency>
diff --git a/gadgets/eXoGadgets/pom.xml b/gadgets/eXoGadgets/pom.xml
index eb600e104..0cf35fc2d 100644
--- a/gadgets/eXoGadgets/pom.xml
+++ b/gadgets/eXoGadgets/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.gadgets</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -37,13 +37,13 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.security</artifactId>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.portal</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/gadgets/gwtGadgets/pom.xml b/gadgets/gwtGadgets/pom.xml
index ee0bdbbed..f3fab3767 100644
--- a/gadgets/gwtGadgets/pom.xml
+++ b/gadgets/gwtGadgets/pom.xml
@@ -25,7 +25,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.gadgets</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/gadgets/pom.xml b/gadgets/pom.xml
index cb4290134..8b40f44bf 100644
--- a/gadgets/pom.xml
+++ b/gadgets/pom.xml
@@ -22,7 +22,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
diff --git a/gadgets/server/pom.xml b/gadgets/server/pom.xml
index 7f05ab51b..b3c2fd152 100644
--- a/gadgets/server/pom.xml
+++ b/gadgets/server/pom.xml
@@ -23,7 +23,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.exoplatform.portal</groupId>
+        <groupId>org.gatein.portal</groupId>
         <artifactId>exo.portal.gadgets</artifactId>
         <version>3.5.0.Beta01-SNAPSHOT</version>
     </parent>
@@ -140,17 +140,17 @@
         <scope>test</scope>
       </dependency>
        <dependency>
-           <groupId>org.exoplatform.portal</groupId>
+           <groupId>org.gatein.portal</groupId>
            <artifactId>exo.portal.gadgets-core</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
-           <groupId>org.exoplatform.portal</groupId>
+           <groupId>org.gatein.portal</groupId>
            <artifactId>exo.portal.component.test.core</artifactId>
            <scope>test</scope>
        </dependency>
         <dependency>
-           <groupId>org.exoplatform.portal</groupId>
+           <groupId>org.gatein.portal</groupId>
            <artifactId>exo.portal.component.portal</artifactId>
            <type>test-jar</type>
            <scope>test</scope>
diff --git a/packaging/common/pom.xml b/packaging/common/pom.xml
index a4a84a819..ad6f71de4 100644
--- a/packaging/common/pom.xml
+++ b/packaging/common/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.packaging</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/packaging/jboss-as7/extension/pom.xml b/packaging/jboss-as7/extension/pom.xml
index 3837db01a..b555615e8 100644
--- a/packaging/jboss-as7/extension/pom.xml
+++ b/packaging/jboss-as7/extension/pom.xml
@@ -24,7 +24,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.packaging.jboss7</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
@@ -60,7 +60,7 @@
          <artifactId>exo.kernel.container</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.webui.portal</artifactId>
       </dependency>
       <dependency>
diff --git a/packaging/jboss-as7/modules/build.xml b/packaging/jboss-as7/modules/build.xml
index ef4d4fb98..17ab7496b 100644
--- a/packaging/jboss-as7/modules/build.xml
+++ b/packaging/jboss-as7/modules/build.xml
@@ -63,7 +63,7 @@
           ~ +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
           -->
         <module-def name="org.gatein">
-            <maven-resource group="org.exoplatform.portal" artifact="jboss-as7-integration-extension" />
+            <maven-resource group="org.gatein.portal" artifact="jboss-as7-integration-extension" />
         </module-def>
 
         <module-def name="org.gatein.lib">
@@ -101,26 +101,26 @@
            <maven-resource group="org.exoplatform.kernel" artifact="exo.kernel.component.common" />
            <maven-resource group="org.exoplatform.kernel" artifact="exo.kernel.component.ext.cache.impl.jboss.v3" />
            <maven-resource group="org.exoplatform.kernel" artifact="exo.kernel.container" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.application-registry" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.common" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.identity" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.management" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.pc" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.portal" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.resources" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.scripting" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.web.api" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.web.controller" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.web.resources" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.web.security" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.component.web.server" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.gadgets-core" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.webui.core" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.webui.dashboard" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.webui.eXo" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.webui.framework" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.webui.portal" />
-           <maven-resource group="org.exoplatform.portal" artifact="exo.portal.webui.portlet" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.application-registry" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.common" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.identity" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.management" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.pc" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.portal" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.resources" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.scripting" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.web.api" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.web.controller" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.web.resources" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.web.security" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.component.web.server" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.gadgets-core" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.webui.core" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.webui.dashboard" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.webui.eXo" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.webui.framework" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.webui.portal" />
+           <maven-resource group="org.gatein.portal" artifact="exo.portal.webui.portlet" />
            <maven-resource group="org.exoplatform.ws" artifact="exo.ws.commons" />
            <maven-resource group="org.exoplatform.ws" artifact="exo.ws.frameworks.json" />
            <maven-resource group="org.exoplatform.ws" artifact="exo.ws.frameworks.servlet" />
diff --git a/packaging/jboss-as7/modules/pom.xml b/packaging/jboss-as7/modules/pom.xml
index b17ad8ef6..635dc03c5 100644
--- a/packaging/jboss-as7/modules/pom.xml
+++ b/packaging/jboss-as7/modules/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.packaging.jboss7</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
@@ -18,7 +18,7 @@
    <dependencies>
 
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>jboss-as7-integration-extension</artifactId>
       </dependency>
       <dependency>
@@ -723,83 +723,83 @@
 
       <!-- GateIn -->
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.application-registry</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.common</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.identity</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.management</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.pc</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.portal</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.resources</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.scripting</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.web.api</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.web.controller</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.web.resources</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.web.security</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.web.server</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.webui.core</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.webui.dashboard</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.webui.eXo</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.webui.framework</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.webui.portal</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.webui.portlet</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.gadgets-core</artifactId>
       </dependency>
 
diff --git a/packaging/jboss-as7/pkg/package.xml b/packaging/jboss-as7/pkg/package.xml
index ce072408e..a9c3584d6 100644
--- a/packaging/jboss-as7/pkg/package.xml
+++ b/packaging/jboss-as7/pkg/package.xml
@@ -66,32 +66,32 @@
 
    <target name="package-samples" unless="pkg.nosamples">
       <!--copy tofile="${jbossas.target.dir}/gatein/deployments/gatein-sample-portal.ear" >
-         <fileset refid="org.exoplatform.portal:gatein-sample-portal:ear"/>
+         <fileset refid="org.gatein.portal:gatein-sample-portal:ear"/>
       </copy-->
       <copy todir="${jbossas.target.dir}/gatein/extensions/gatein-sample-portal.ear/lib" >
-         <fileset refid="org.exoplatform.portal:exo.portal.sample.portal.config:jar"/>
+         <fileset refid="org.gatein.portal:exo.portal.sample.portal.config:jar"/>
       </copy>
       <copy todir="${jbossas.target.dir}/gatein/extensions/gatein-sample-portal.ear/lib" >
-         <fileset refid="org.exoplatform.portal:exo.portal.sample.portal.jar:jar"/>
+         <fileset refid="org.gatein.portal:exo.portal.sample.portal.jar:jar"/>
       </copy>
       <copy tofile="${jbossas.target.dir}/gatein/extensions/gatein-sample-portal.ear/sample-portal.war" >
-         <fileset refid="org.exoplatform.portal:exo.portal.sample.portal.war:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.sample.portal.war:war"/>
       </copy>
       <copy tofile="${jbossas.target.dir}/gatein/extensions/gatein-sample-portal.ear/rest-sample-portal.war" >
-         <fileset refid="org.exoplatform.portal:exo.portal.sample.portal.rest-war:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.sample.portal.rest-war:war"/>
       </copy>
 
       <!--copy tofile="${jbossas.target.dir}/gatein/deployments/gatein-sample-extension.ear">
-         <fileset refid="org.exoplatform.portal:gatein-sample-extension:ear"/>
+         <fileset refid="org.gatein.portal:gatein-sample-extension:ear"/>
       </copy-->
       <copy todir="${jbossas.target.dir}/gatein/extensions/gatein-sample-extension.ear/lib" >
-         <fileset refid="org.exoplatform.portal:exo.portal.sample.extension.config:jar"/>
+         <fileset refid="org.gatein.portal:exo.portal.sample.extension.config:jar"/>
       </copy>
       <copy todir="${jbossas.target.dir}/gatein/extensions/gatein-sample-extension.ear/lib" >
-         <fileset refid="org.exoplatform.portal:exo.portal.sample.extension.jar:jar"/>
+         <fileset refid="org.gatein.portal:exo.portal.sample.extension.jar:jar"/>
       </copy>
       <copy tofile="${jbossas.target.dir}/gatein/extensions/gatein-sample-extension.ear/sample-ext.war" >
-         <fileset refid="org.exoplatform.portal:exo.portal.sample.extension.war:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.sample.extension.war:war"/>
       </copy>
 
       <copy tofile="${jbossas.target.dir}/gatein/extensions/gatein-sample-skin.war">
@@ -122,31 +122,31 @@
       <!-- Copy gatein.ear -->
 
       <unzip dest="${jbossas.target.dir}/gatein/gatein.ear/eXoResources.war">
-         <fileset refid="org.exoplatform.portal:exo.portal.web.eXoResources:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.web.eXoResources:war"/>
       </unzip>
       <unzip dest="${jbossas.target.dir}/gatein/gatein.ear/portal.war">
-         <fileset refid="org.exoplatform.portal:exo.portal.web.portal:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.web.portal:war"/>
       </unzip>
       <copy tofile="${jbossas.target.dir}/gatein/gatein.ear/dashboard.war" >
-         <fileset refid="org.exoplatform.portal:exo.portal.portlet.dashboard:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.portlet.dashboard:war"/>
       </copy>
       <copy tofile="${jbossas.target.dir}/gatein/gatein.ear/exoadmin.war" >
-         <fileset refid="org.exoplatform.portal:exo.portal.portlet.exoadmin:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.portlet.exoadmin:war"/>
       </copy>
       <copy tofile="${jbossas.target.dir}/gatein/gatein.ear/eXoGadgets.war" >
-         <fileset refid="org.exoplatform.portal:exo.portal.eXoGadgets:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.eXoGadgets:war"/>
       </copy>
       <copy tofile="${jbossas.target.dir}/gatein/gatein.ear/gwtGadgets.war" >
-         <fileset refid="org.exoplatform.portal:exo.portal.gwtGadgets:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.gwtGadgets:war"/>
       </copy>
       <copy tofile="${jbossas.target.dir}/gatein/gatein.ear/eXoGadgetServer.war" >
-         <fileset refid="org.exoplatform.portal:exo.portal.gadgets-server:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.gadgets-server:war"/>
       </copy>
       <copy tofile="${jbossas.target.dir}/gatein/gatein.ear/rest.war" >
-         <fileset refid="org.exoplatform.portal:exo.portal.web.rest:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.web.rest:war"/>
       </copy>
       <copy tofile="${jbossas.target.dir}/gatein/gatein.ear/web.war" >
-         <fileset refid="org.exoplatform.portal:exo.portal.portlet.web:war"/>
+         <fileset refid="org.gatein.portal:exo.portal.portlet.web:war"/>
       </copy>
       <copy tofile="${jbossas.target.dir}/gatein/gatein.ear/redirect-portlet.war">
          <fileset refid="org.gatein.portal.portlet:redirect:war"/>
@@ -182,7 +182,7 @@
       </copy>
 
       <!-- Extract common config from packaging.common artifact to gatein/conf -->
-      <unzip src="${org.exoplatform.portal:exo.portal.packaging.common:jar}" dest="${jbossas.target.dir}/standalone/configuration/gatein">
+      <unzip src="${org.gatein.portal:exo.portal.packaging.common:jar}" dest="${jbossas.target.dir}/standalone/configuration/gatein">
         <patternset>
           <exclude name="META-INF/"/>
         </patternset>
diff --git a/packaging/jboss-as7/pkg/pom.xml b/packaging/jboss-as7/pkg/pom.xml
index 68a82035d..1239463da 100644
--- a/packaging/jboss-as7/pkg/pom.xml
+++ b/packaging/jboss-as7/pkg/pom.xml
@@ -4,7 +4,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.packaging.jboss7</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
@@ -25,11 +25,11 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>jboss-as7-integration-extension</artifactId>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>jboss-as7-integration-modules</artifactId>
       </dependency>
 
@@ -39,47 +39,47 @@
 
       <!-- Default Portal -->
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.web.eXoResources</artifactId>
          <type>war</type>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.web.portal</artifactId>
          <type>war</type>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.gadgets-server</artifactId>
          <type>war</type>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.eXoGadgets</artifactId>
          <type>war</type>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.gwtGadgets</artifactId>
          <type>war</type>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.portlet.web</artifactId>
          <type>war</type>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.web.rest</artifactId>
          <type>war</type>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.portlet.exoadmin</artifactId>
          <type>war</type>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.portlet.dashboard</artifactId>
          <type>war</type>
       </dependency>
@@ -117,29 +117,29 @@
 
       <!-- Sample Portal -->
       <!--dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>gatein-sample-portal</artifactId>
          <type>ear</type>
          <version>${project.version}</version>
       </dependency-->
       <dependency>
-        <groupId>org.exoplatform.portal</groupId>
+        <groupId>org.gatein.portal</groupId>
         <artifactId>exo.portal.sample.portal.config</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.exoplatform.portal</groupId>
+        <groupId>org.gatein.portal</groupId>
         <artifactId>exo.portal.sample.portal.jar</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.exoplatform.portal</groupId>
+        <groupId>org.gatein.portal</groupId>
         <artifactId>exo.portal.sample.portal.war</artifactId>
          <version>${project.version}</version>
         <type>war</type>
       </dependency>
       <dependency>
-        <groupId>org.exoplatform.portal</groupId>
+        <groupId>org.gatein.portal</groupId>
         <artifactId>exo.portal.sample.portal.rest-war</artifactId>
          <version>${project.version}</version>
         <type>war</type>
@@ -148,23 +148,23 @@
 
       <!-- Sample Extension -->
       <!--dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>gatein-sample-extension</artifactId>
          <type>ear</type>
          <version>${project.version}</version>
       </dependency-->
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.sample.extension.config</artifactId>
          <version>${project.version}</version>
        </dependency>
        <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.sample.extension.jar</artifactId>
           <version>${project.version}</version>
        </dependency>
        <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.sample.extension.war</artifactId>
           <version>${project.version}</version>
          <type>war</type>
@@ -186,7 +186,7 @@
 
       <!-- Need to declare this artifact to have access to its path from package.xml -->
       <dependency>
-        <groupId>org.exoplatform.portal</groupId>
+        <groupId>org.gatein.portal</groupId>
         <artifactId>exo.portal.packaging.common</artifactId>
       </dependency>
 
diff --git a/packaging/jboss-as7/pom.xml b/packaging/jboss-as7/pom.xml
index 5329f36fb..2660ce5d0 100644
--- a/packaging/jboss-as7/pom.xml
+++ b/packaging/jboss-as7/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.packaging</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
@@ -24,7 +24,7 @@
    <dependencyManagement>
       <dependencies>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>jboss-as7-integration-extension</artifactId>
             <version>${project.version}</version>
          </dependency>
@@ -34,7 +34,7 @@
             <version>${version.org.gatein.naming}</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>jboss-as7-integration-modules</artifactId>
             <version>${project.version}</version>
          </dependency>
diff --git a/packaging/jetty/pkg/package.xml b/packaging/jetty/pkg/package.xml
index 6f30596ad..390bcb4eb 100644
--- a/packaging/jetty/pkg/package.xml
+++ b/packaging/jetty/pkg/package.xml
@@ -64,7 +64,7 @@
       </copy>
 
       <!-- Extract common config from packaging.common artifact to gatein/conf -->
-      <unzip src="${org.exoplatform.portal:exo.portal.packaging.common:jar}" dest="${maven.project.build.directory}/jetty/gatein/conf">
+      <unzip src="${org.gatein.portal:exo.portal.packaging.common:jar}" dest="${maven.project.build.directory}/jetty/gatein/conf">
         <patternset>
           <exclude name="META-INF/"/>
         </patternset>
diff --git a/packaging/jetty/pkg/pom.xml b/packaging/jetty/pkg/pom.xml
index eb5e1dc8c..969507291 100644
--- a/packaging/jetty/pkg/pom.xml
+++ b/packaging/jetty/pkg/pom.xml
@@ -4,7 +4,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.packaging.jetty</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -405,87 +405,87 @@
 
     <!-- GateIn -->
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.application-registry</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.identity</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.pc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.portal</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.resources</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.scripting</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.controller</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.resources</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.security</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.dashboard</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.eXo</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.framework</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.portal</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.portlet</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.gadgets-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.packaging.common</artifactId>
     </dependency>
 
@@ -770,49 +770,49 @@
     <!-- War files -->
     <dependency>
       <?rename portal.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.web.portal</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename eXoGadgetServer.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.gadgets-server</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename eXoGadgets.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.eXoGadgets</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename gwtGadgets.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.gwtGadgets</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename web.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.portlet.web</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename rest.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.web.rest</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename exoadmin.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.portlet.exoadmin</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename eXoResources.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.web.eXoResources</artifactId>
       <type>war</type>
     </dependency>
@@ -826,7 +826,7 @@
 
     <dependency>
       <?rename dashboard.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.portlet.dashboard</artifactId>
       <type>war</type>
     </dependency>
diff --git a/packaging/jetty/pom.xml b/packaging/jetty/pom.xml
index dcdf2afb6..41ea88891 100644
--- a/packaging/jetty/pom.xml
+++ b/packaging/jetty/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.packaging</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 298202f13..c8f0123a4 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.parent</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/packaging/tomcat/integration/pom.xml b/packaging/tomcat/integration/pom.xml
index 24cb22b17..23b3ab2bd 100644
--- a/packaging/tomcat/integration/pom.xml
+++ b/packaging/tomcat/integration/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.packaging.tomcat</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
diff --git a/packaging/tomcat/pkg/pom.xml b/packaging/tomcat/pkg/pom.xml
index 4dbbdece6..d4b0e65de 100644
--- a/packaging/tomcat/pkg/pom.xml
+++ b/packaging/tomcat/pkg/pom.xml
@@ -4,7 +4,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.packaging.tomcat</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -394,92 +394,92 @@
 
     <!-- GateIn -->
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.application-registry</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.identity</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.management</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.pc</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.portal</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.resources</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.scripting</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.controller</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.resources</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.security</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.dashboard</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.eXo</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.framework</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.portal</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.portlet</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.gadgets-core</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.packaging.common</artifactId>
     </dependency>
     <!--
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>gatein.portal.component.wsrp</artifactId>
     </dependency>
     -->
@@ -769,49 +769,49 @@
  <!-- War files -->
     <dependency>
       <?rename portal.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.web.portal</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename eXoGadgetServer.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.gadgets-server</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename eXoGadgets.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.eXoGadgets</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename gwtGadgets.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.gwtGadgets</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename web.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.portlet.web</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename rest.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.web.rest</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename exoadmin.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.portlet.exoadmin</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
       <?rename eXoResources.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.web.eXoResources</artifactId>
       <type>war</type>
     </dependency>
@@ -825,7 +825,7 @@
     
     <dependency>
       <?rename dashboard.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.portlet.dashboard</artifactId>
       <type>war</type>
     </dependency>
@@ -839,7 +839,7 @@
 
     <dependency>
       <?rename integration.war?>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.packaging.tomcat.integration</artifactId>
       <version>${project.version}</version>
       <type>war</type>
diff --git a/packaging/tomcat/pkg/tc7/package.xml b/packaging/tomcat/pkg/tc7/package.xml
index f05e2a02d..b36584faa 100644
--- a/packaging/tomcat/pkg/tc7/package.xml
+++ b/packaging/tomcat/pkg/tc7/package.xml
@@ -64,7 +64,7 @@
         tofile="${maven.project.build.directory}/tomcat7/webapps/integration/WEB-INF/web.xml"/>
 
     <!-- Extract common config from packaging.common artifact to gatein/conf -->
-    <unzip src="${org.exoplatform.portal:exo.portal.packaging.common:jar}" dest="${maven.project.build.directory}/tomcat7/gatein/conf">
+    <unzip src="${org.gatein.portal:exo.portal.packaging.common:jar}" dest="${maven.project.build.directory}/tomcat7/gatein/conf">
       <patternset>
         <exclude name="META-INF/"/>
       </patternset>
diff --git a/packaging/tomcat/pkg/tc7/pom.xml b/packaging/tomcat/pkg/tc7/pom.xml
index f15e9500b..8adc094a0 100644
--- a/packaging/tomcat/pkg/tc7/pom.xml
+++ b/packaging/tomcat/pkg/tc7/pom.xml
@@ -4,7 +4,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.packaging.tomcat.pkg</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
diff --git a/packaging/tomcat/pom.xml b/packaging/tomcat/pom.xml
index bf90ed184..b18ae100a 100644
--- a/packaging/tomcat/pom.xml
+++ b/packaging/tomcat/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.packaging</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/pom.xml b/pom.xml
index 1ddbf3052..17695c12b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
       <version>1.2.0.Alpha03</version>
    </parent>
 
-   <groupId>org.exoplatform.portal</groupId>
+   <groupId>org.gatein.portal</groupId>
    <artifactId>exo.portal.parent</artifactId>
    <version>3.5.0.Beta01-SNAPSHOT</version>
    <packaging>pom</packaging>
@@ -454,204 +454,204 @@
 
         <!-- GateIn -->
         <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.common</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.web</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.web.controller</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.web.security</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.web.server</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.web.api</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.web.resources</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.portal</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.portal</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>test-jar</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.pc</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.identity</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.identity</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>test-jar</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.resources</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.application-registry</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.scripting</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.management</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.webui.framework</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.webui.portlet</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.webui.portal</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.webui.eXo</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.webui.core</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.webui.dashboard</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.gadgets-core</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.test.core</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.test.core</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>test-jar</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.test.jcr</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.component.test.jcr</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>test-jar</type>
          </dependency>
          <dependency>
-          <groupId>org.exoplatform.portal</groupId>
+          <groupId>org.gatein.portal</groupId>
           <artifactId>exo.portal.component.test.web</artifactId>
           <version>3.5.0.Beta01-SNAPSHOT</version>
         </dependency>
         <dependency>
-          <groupId>org.exoplatform.portal</groupId>
+          <groupId>org.gatein.portal</groupId>
           <artifactId>exo.portal.component.test.web</artifactId>
           <version>3.5.0.Beta01-SNAPSHOT</version>
           <type>test-jar</type>
         </dependency>
         <dependency>
-          <groupId>org.exoplatform.portal</groupId>
+          <groupId>org.gatein.portal</groupId>
           <artifactId>exo.portal.packaging.common</artifactId>
           <version>${project.version}</version>
         </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.web.portal</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.gadgets-server</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.eXoGadgets</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.gwtGadgets</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.portlet.web</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.web.rest</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.portlet.exoadmin</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>war</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.web.eXoResources</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>war</type>
@@ -663,7 +663,7 @@
             <type>war</type>
          </dependency>
          <dependency>
-            <groupId>org.exoplatform.portal</groupId>
+            <groupId>org.gatein.portal</groupId>
             <artifactId>exo.portal.portlet.dashboard</artifactId>
             <version>3.5.0.Beta01-SNAPSHOT</version>
             <type>war</type>
diff --git a/portlet/dashboard/pom.xml b/portlet/dashboard/pom.xml
index 109ad060f..4e8d13e20 100644
--- a/portlet/dashboard/pom.xml
+++ b/portlet/dashboard/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<groupId>org.exoplatform.portal</groupId>
+		<groupId>org.gatein.portal</groupId>
 		<artifactId>exo.portal.portlet</artifactId>
 		<version>3.5.0.Beta01-SNAPSHOT</version>
 	</parent>
@@ -33,18 +33,18 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.portal</artifactId>
       <scope>provided</scope>
     </dependency>   
     
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.eXo</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.dashboard</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/portlet/exoadmin/pom.xml b/portlet/exoadmin/pom.xml
index e835cf107..dca767d2f 100644
--- a/portlet/exoadmin/pom.xml
+++ b/portlet/exoadmin/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.portlet</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -33,13 +33,13 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.portal</artifactId>
       <scope>provided</scope>
     </dependency>   
     
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.eXo</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/portlet/pom.xml b/portlet/pom.xml
index 358fc0252..d91cf7f5e 100644
--- a/portlet/pom.xml
+++ b/portlet/pom.xml
@@ -24,7 +24,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.parent</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/portlet/redirect/pom.xml b/portlet/redirect/pom.xml
index 186055b9e..454624e0a 100644
--- a/portlet/redirect/pom.xml
+++ b/portlet/redirect/pom.xml
@@ -7,7 +7,7 @@
       and version
    -->
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.portlet</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/portlet/web/pom.xml b/portlet/web/pom.xml
index 6b92a5e0e..16d3e8904 100644
--- a/portlet/web/pom.xml
+++ b/portlet/web/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.portlet</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -33,7 +33,7 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.portal</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/starter/ear/pom.xml b/starter/ear/pom.xml
index 4cdfc72ec..437e97133 100644
--- a/starter/ear/pom.xml
+++ b/starter/ear/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
@@ -36,7 +36,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.starter.war</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
       <type>war</type>
@@ -51,7 +51,7 @@
            <displayName>starter</displayName>
            <modules>
              <webModule>
-               <groupId>org.exoplatform.portal</groupId>
+               <groupId>org.gatein.portal</groupId>
                <artifactId>exo.portal.starter.war</artifactId>
                <contextRoot>starter</contextRoot>
              </webModule>
diff --git a/starter/pom.xml b/starter/pom.xml
index 5836d6728..ff4e224ac 100644
--- a/starter/pom.xml
+++ b/starter/pom.xml
@@ -22,7 +22,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
diff --git a/starter/war/pom.xml b/starter/war/pom.xml
index 1aa56502b..273acc6f7 100644
--- a/starter/war/pom.xml
+++ b/starter/war/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.parent</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index d94814386..9a5d3a460 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-     <groupId>org.exoplatform.portal</groupId>
+     <groupId>org.gatein.portal</groupId>
      <artifactId>exo.portal.parent</artifactId>
      <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
diff --git a/testsuite/selenium-snifftests/pom.xml b/testsuite/selenium-snifftests/pom.xml
index 69d6a49eb..1a4a8d07a 100644
--- a/testsuite/selenium-snifftests/pom.xml
+++ b/testsuite/selenium-snifftests/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.exoplatform.portal</groupId>
+		<groupId>org.gatein.portal</groupId>
 		<artifactId>exo.portal.testsuite</artifactId>
 		<version>3.5.0.Beta01-SNAPSHOT</version>
 	</parent>
diff --git a/testsuite/selenium-tests-other/pom.xml b/testsuite/selenium-tests-other/pom.xml
index 529c4804f..1f93bbef6 100644
--- a/testsuite/selenium-tests-other/pom.xml
+++ b/testsuite/selenium-tests-other/pom.xml
@@ -24,7 +24,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.testsuite</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/testsuite/webuibasedsamples/pom.xml b/testsuite/webuibasedsamples/pom.xml
index 277ed3733..89c27cc45 100644
--- a/testsuite/webuibasedsamples/pom.xml
+++ b/testsuite/webuibasedsamples/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.testsuite</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
@@ -12,13 +12,13 @@
 
    <dependencies>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.webui.portal</artifactId>
          <scope>provided</scope>
       </dependency>
 
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.webui.eXo</artifactId>
          <scope>provided</scope>
       </dependency>
diff --git a/web/eXoResources/pom.xml b/web/eXoResources/pom.xml
index 8146c7fdb..f0124fae3 100644
--- a/web/eXoResources/pom.xml
+++ b/web/eXoResources/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.web</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
diff --git a/web/pom.xml b/web/pom.xml
index fdbb80858..945b22523 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -24,7 +24,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.parent</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/web/portal/pom.xml b/web/portal/pom.xml
index 7b900a448..f9b16c191 100644
--- a/web/portal/pom.xml
+++ b/web/portal/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.web</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
diff --git a/web/redirect/pom.xml b/web/redirect/pom.xml
index 46125d31e..2bad6fadd 100644
--- a/web/redirect/pom.xml
+++ b/web/redirect/pom.xml
@@ -24,7 +24,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.web</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
@@ -37,7 +37,7 @@
 
    <dependencies>
      <dependency>
-       <groupId>org.exoplatform.portal</groupId>    
+       <groupId>org.gatein.portal</groupId>    
        <artifactId>exo.portal.component.common</artifactId>
        <exclusions>
          <exclusion>
@@ -47,7 +47,7 @@
        </exclusions>
      </dependency>
      <dependency>
-       <groupId>org.exoplatform.portal</groupId>
+       <groupId>org.gatein.portal</groupId>
        <artifactId>exo.portal.webui.portal</artifactId>
      </dependency>
 
@@ -58,19 +58,19 @@
     </dependency>
 
      <dependency>
-       <groupId>org.exoplatform.portal</groupId>
+       <groupId>org.gatein.portal</groupId>
        <artifactId>exo.portal.component.test.core</artifactId>
        <scope>test</scope>
      </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.jcr</artifactId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.identity</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
diff --git a/web/rest/pom.xml b/web/rest/pom.xml
index 1dd373b06..f6abed8b5 100644
--- a/web/rest/pom.xml
+++ b/web/rest/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.web</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
diff --git a/webui/core/pom.xml b/webui/core/pom.xml
index 4d0141829..93897b744 100644
--- a/webui/core/pom.xml
+++ b/webui/core/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.webui</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -33,23 +33,23 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.framework</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.portlet</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.portal</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.server</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.api</artifactId>
     </dependency>
     <dependency>
@@ -57,7 +57,7 @@
       <artifactId>common-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/webui/dashboard/pom.xml b/webui/dashboard/pom.xml
index cb2e37249..2eae6db22 100644
--- a/webui/dashboard/pom.xml
+++ b/webui/dashboard/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<parent>
-		<groupId>org.exoplatform.portal</groupId>
+		<groupId>org.gatein.portal</groupId>
 		<artifactId>exo.portal.webui</artifactId>
 		<version>3.5.0.Beta01-SNAPSHOT</version>
 	</parent>
@@ -33,11 +33,11 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.portal</artifactId>
     </dependency>   
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.eXo</artifactId>
     </dependency>
   </dependencies> 
diff --git a/webui/eXo/pom.xml b/webui/eXo/pom.xml
index 82c8422b7..9eb1c9f63 100644
--- a/webui/eXo/pom.xml
+++ b/webui/eXo/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.webui</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -33,12 +33,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.core</artifactId>
     </dependency>
     
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.application-registry</artifactId>
     </dependency>
   </dependencies>
diff --git a/webui/framework/pom.xml b/webui/framework/pom.xml
index 6a6ee2e8c..34ee53c9b 100644
--- a/webui/framework/pom.xml
+++ b/webui/framework/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.webui</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -37,23 +37,23 @@
       <artifactId>common-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.controller</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.resources</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.scripting</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.web.resources</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/webui/pom.xml b/webui/pom.xml
index aaf70fd1b..1d4344a38 100644
--- a/webui/pom.xml
+++ b/webui/pom.xml
@@ -24,7 +24,7 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.parent</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>
diff --git a/webui/portal/pom.xml b/webui/portal/pom.xml
index 3135b1376..cd88fb027 100644
--- a/webui/portal/pom.xml
+++ b/webui/portal/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.webui</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent> 
@@ -43,32 +43,32 @@
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.resources</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.core</artifactId>
     </dependency>
     
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.eXo</artifactId>
     </dependency>
     
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.portal</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.application-registry</artifactId>
     </dependency>
     
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.pc</artifactId>
     </dependency>
 
@@ -90,7 +90,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.gadgets-core</artifactId>
     </dependency>
 
@@ -100,7 +100,7 @@
     </dependency>
     
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.component.test.core</artifactId>
       <scope>test</scope>
     </dependency>
diff --git a/webui/portlet/pom.xml b/webui/portlet/pom.xml
index ce000efb5..af80821ce 100644
--- a/webui/portlet/pom.xml
+++ b/webui/portlet/pom.xml
@@ -21,7 +21,7 @@
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <groupId>org.exoplatform.portal</groupId>
+    <groupId>org.gatein.portal</groupId>
     <artifactId>exo.portal.webui</artifactId>
     <version>3.5.0.Beta01-SNAPSHOT</version>
   </parent>
@@ -33,7 +33,7 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.webui.framework</artifactId>
     </dependency>
   </dependencies>
diff --git a/wsrp-integration/extension-component/pom.xml b/wsrp-integration/extension-component/pom.xml
index 39496ba34..e0db212a3 100644
--- a/wsrp-integration/extension-component/pom.xml
+++ b/wsrp-integration/extension-component/pom.xml
@@ -103,17 +103,17 @@
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.pc</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.common</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
-         <groupId>org.exoplatform.portal</groupId>
+         <groupId>org.gatein.portal</groupId>
          <artifactId>exo.portal.component.portal</artifactId>
          <scope>provided</scope>
       </dependency>
diff --git a/wsrp-integration/pom.xml b/wsrp-integration/pom.xml
index bbf332f4d..dcf823d25 100644
--- a/wsrp-integration/pom.xml
+++ b/wsrp-integration/pom.xml
@@ -33,7 +33,7 @@
    <packaging>pom</packaging>
 
    <parent>
-      <groupId>org.exoplatform.portal</groupId>
+      <groupId>org.gatein.portal</groupId>
       <artifactId>exo.portal.parent</artifactId>
       <version>3.5.0.Beta01-SNAPSHOT</version>
    </parent>