* updating from Galileo to Helios (M3)

* updating from Eclipse 3.5.x to 3.6.0

36 files changed, 122 insertions, 122 deletions

diff --git a/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_galileo.xml b/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml
index ab928a5b..fd1b5f50 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_galileo.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml
@@ -36,9 +36,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-	<rcp version="3.5.1" />
+	<rcp version="3.6.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-cpp-galileo-SR1" />
+	<product name="eclipse-cpp-helios-M3" />
 
 </configuration>
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.cpp.feature/feature.xml b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
index bf7179b2..90528f9e 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.cpp.feature/feature.xml
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Galileo" url="http://download.eclipse.org/releases/galileo/"/>
-      <discovery label="Eclipse Platform 3.5" url="http://download.eclipse.org/eclipse/updates/3.5"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -28,8 +28,8 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.5.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.cdt.platform" version="6.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.cdt" version="6.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mylyn_feature"/>
diff --git a/packages/org.eclipse.epp.package.cpp.feature/p2.inf b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
index 9049bf5e..8a961094 100644
--- a/packages/org.eclipse.epp.package.cpp.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.cpp.feature/p2.inf
@@ -8,9 +8,9 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.java.feature/eclipse_java_galileo.xml b/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml
index a5438644..fbb26b10 100644
--- a/packages/org.eclipse.epp.package.java.feature/eclipse_java_galileo.xml
+++ b/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml
@@ -33,9 +33,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.5.1" />
+  <rcp version="3.6.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-java-galileo-SR1" />
+	<product name="eclipse-java-helios-M3" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.java.feature/feature.xml b/packages/org.eclipse.epp.package.java.feature/feature.xml
index b75ed106..67bed7fd 100644
--- a/packages/org.eclipse.epp.package.java.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.java.feature/feature.xml
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Galileo" url="http://download.eclipse.org/releases/galileo/"/>
-      <discovery label="Eclipse Platform 3.5" url="http://download.eclipse.org/eclipse/updates/3.5"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
       <discovery label="Mylyn Updates" url="http://download.eclipse.org/tools/mylyn/update/e3.4/"/>
    </url>
 
@@ -29,9 +29,9 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jdt" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.5.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.wst.xml_ui.feature"/>
       <import feature="org.eclipse.mylyn.ide_feature"/>
       <import feature="org.eclipse.mylyn.java_feature"/>
diff --git a/packages/org.eclipse.epp.package.java.feature/p2.inf b/packages/org.eclipse.epp.package.java.feature/p2.inf
index e5afc0eb..f4286db4 100644
--- a/packages/org.eclipse.epp.package.java.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.java.feature/p2.inf
@@ -8,13 +8,13 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/,name:Mylyn for Eclipse 3.4 and 3.5);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/,name:Mylyn for Eclipse 3.4 and 3.5);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/);\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/);
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_galileo.xml b/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml
index aaad74d3..b8dab522 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_galileo.xml
+++ b/packages/org.eclipse.epp.package.javascript.feature/eclipse_javascript_helios.xml
@@ -32,7 +32,7 @@
 

   <!-- version, the RCP version to build. This is used to determine the file 

     name of the root file archives -->

-  <rcp version="3.5.1" />

+  <rcp version="3.6.0" />

 

   <!-- name, the name of the product, used in naming the created files. -->

   <product name="eclipse-javascript-helios" />

diff --git a/packages/org.eclipse.epp.package.javascript.feature/feature.properties b/packages/org.eclipse.epp.package.javascript.feature/feature.properties
index 78ad8e79..d8db85af 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/feature.properties
+++ b/packages/org.eclipse.epp.package.javascript.feature/feature.properties
@@ -21,7 +21,7 @@ featureName=Java EE IDE Feature
 providerName=Eclipse.org - EPP

 

 # "updateSiteName" property - label for the update site

-discoverySiteName=Eclipse Galileo Release

+discoverySiteName=Eclipse Helios Release

 

 # "description" property - description of the feature

 description=Eclipse Java EE IDE is an all-in-one package for creating web applications. \n\ 

diff --git a/packages/org.eclipse.epp.package.javascript.feature/feature.xml b/packages/org.eclipse.epp.package.javascript.feature/feature.xml
index efd3fbb0..1bfb4790 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.javascript.feature/feature.xml
@@ -19,7 +19,7 @@
    </license>

 

    <url>

-      <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/galileo/"/>

+      <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/helios/"/>

    </url>

 

    <includes

diff --git a/packages/org.eclipse.epp.package.javascript.feature/p2.inf b/packages/org.eclipse.epp.package.javascript.feature/p2.inf
index dcc28f57..ae7b2eaf 100644
--- a/packages/org.eclipse.epp.package.javascript.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.javascript.feature/p2.inf
@@ -8,16 +8,16 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true

 

 instructions.configure=\

-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\

-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\

+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\

+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\

 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/webtools/updates,name:The Eclipse Web Tools Platform (WTP) Project update site);\

 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/updates,name:The Eclipse Web Tools Platform (WTP) Project update site);\

 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/,name:Mylyn for Eclipse 3.4 and 3.5);\

 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/,name:Mylyn for Eclipse 3.4 and 3.5);

 

 instructions.unconfigure=\

-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\

-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\

+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\

+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\

 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/webtools/updates);\

 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/updates);\

 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/);\

diff --git a/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_galileo.xml b/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml
index 304f45a9..8a2e2185 100644
--- a/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_galileo.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml
@@ -40,9 +40,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.5.1" />
+  <rcp version="3.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-jee-galileo-SR1" />
+  <product name="eclipse-jee-helios-M3" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.properties b/packages/org.eclipse.epp.package.jee.feature/feature.properties
index 8109d5c3..c735ca8f 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.properties
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.properties
@@ -21,7 +21,7 @@ featureName=Java EE IDE Feature
 providerName=Eclipse.org - EPP
 
 # "updateSiteName" property - label for the update site
-discoverySiteName=Eclipse Galileo Release
+discoverySiteName=Eclipse Helios Release
 
 # "description" property - description of the feature
 description=Eclipse Java EE IDE is an all-in-one package for creating web applications. \n\ 
diff --git a/packages/org.eclipse.epp.package.jee.feature/feature.xml b/packages/org.eclipse.epp.package.jee.feature/feature.xml
index 690ca48d..99144c8c 100644
--- a/packages/org.eclipse.epp.package.jee.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.jee.feature/feature.xml
@@ -19,7 +19,7 @@
    </license>
 
    <url>
-      <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/galileo/"/>
+      <discovery label="%discoverySiteName" url="http://download.eclipse.org/releases/helios/"/>
    </url>
 
    <includes
diff --git a/packages/org.eclipse.epp.package.jee.feature/p2.inf b/packages/org.eclipse.epp.package.jee.feature/p2.inf
index dfe5d358..24a6ffd5 100644
--- a/packages/org.eclipse.epp.package.jee.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.jee.feature/p2.inf
@@ -8,16 +8,16 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/webtools/updates,name:The Eclipse Web Tools Platform (WTP) Project update site);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/webtools/updates,name:The Eclipse Web Tools Platform (WTP) Project update site);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/,name:Mylyn for Eclipse 3.4 and 3.5);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/,name:Mylyn for Eclipse 3.4 and 3.5);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/webtools/updates);\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/webtools/updates);\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/);\
diff --git a/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_galileo.xml b/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml
index 26378d18..21373cb3 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_galileo.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml
@@ -86,9 +86,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.5.1" />
+  <rcp version="3.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-modeling-galileo-SR1-incubation" />
+  <product name="eclipse-modeling-helios-M3-incubation" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/feature.xml b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
index 48bdd731..eef829c6 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.modeling.feature/feature.xml
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Galileo" url="http://download.eclipse.org/releases/galileo/"/>
-      <discovery label="Eclipse Platform 3.5" url="http://download.eclipse.org/eclipse/updates/3.5"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -28,10 +28,10 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jdt" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.pde" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.sdk" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.5.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.pde" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.sdk" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.wst.xml_ui.feature"/>
       <import feature="org.eclipse.mylyn.ide_feature"/>
       <import feature="org.eclipse.mylyn.java_feature"/>
diff --git a/packages/org.eclipse.epp.package.modeling.feature/p2.inf b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
index 9049bf5e..8a961094 100644
--- a/packages/org.eclipse.epp.package.modeling.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.modeling.feature/p2.inf
@@ -8,9 +8,9 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.php.feature/eclipse_php_galileo.xml b/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml
index 305686dc..2eb497b6 100644
--- a/packages/org.eclipse.epp.package.php.feature/eclipse_php_galileo.xml
+++ b/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml
@@ -49,12 +49,12 @@
 		version, the RCP version to build. This is used to determine the file
 		name of the root file archives
 	-->
-	<rcp version="3.5.1" />
+	<rcp version="3.6.0" />
 
 	<!--
 		name, name of the product, used in naming the created files.
 	-->
-	<product name="eclipse-php-galileo-SR1" />
+	<product name="eclipse-php-helios-M3" />
 
 </configuration>
 
diff --git a/packages/org.eclipse.epp.package.php.feature/feature.xml b/packages/org.eclipse.epp.package.php.feature/feature.xml
index 7b1fcfcc..6fd889f5 100644
--- a/packages/org.eclipse.epp.package.php.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.php.feature/feature.xml
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Galileo" url="http://download.eclipse.org/releases/galileo/"/>
-      <discovery label="Eclipse Platform 3.5" url="http://download.eclipse.org/eclipse/updates/3.5"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -28,8 +28,8 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.5.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mylyn.ide_feature"/>
       <import feature="org.eclipse.mylyn.bugzilla_feature"/>
       <import feature="org.eclipse.mylyn.context_feature"/>
diff --git a/packages/org.eclipse.epp.package.php.feature/p2.inf b/packages/org.eclipse.epp.package.php.feature/p2.inf
index 9049bf5e..8a961094 100644
--- a/packages/org.eclipse.epp.package.php.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.php.feature/p2.inf
@@ -8,9 +8,9 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_galileo.xml b/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml
index 5aee4e58..85bebab7 100644
--- a/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_galileo.xml
+++ b/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml
@@ -36,9 +36,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.5.1" />
+  <rcp version="3.6.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-pulsar-galileo-SR1" />
+	<product name="eclipse-pulsar-helios-M3" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.pulsar.feature/feature.xml b/packages/org.eclipse.epp.package.pulsar.feature/feature.xml
index 56516d5d..b236476c 100644
--- a/packages/org.eclipse.epp.package.pulsar.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.pulsar.feature/feature.xml
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Galileo" url="http://download.eclipse.org/releases/galileo/"/>
-      <discovery label="Eclipse Platform 3.5" url="http://download.eclipse.org/eclipse/updates/3.5"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -28,10 +28,10 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jdt" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.pde" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.5.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.pde" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mtj" version="1.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.mtj.pulsar" version="1.0.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.wst.xml_ui.feature"/>
diff --git a/packages/org.eclipse.epp.package.pulsar.feature/p2.inf b/packages/org.eclipse.epp.package.pulsar.feature/p2.inf
index aa46c948..4ba1f211 100644
--- a/packages/org.eclipse.epp.package.pulsar.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.pulsar.feature/p2.inf
@@ -8,12 +8,12 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
 org.eclipse.equinox.p2.touchpoint.eclipse.setProgramProperty(propName:osgi.splashPath, propValue:platform:/base/plugins/org.eclipse.epp.package.pulsar);\
 org.eclipse.equinox.p2.touchpoint.eclipse.setProgramProperty(propName:eclipse.product,propValue:org.eclipse.epp.package.pulsar.product);\
 org.eclipse.equinox.p2.touchpoint.eclipse.setProgramProperty(propName:eclipse.application,propValue:org.eclipse.ui.ide.workbench);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_galileo.xml b/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml
index f69a3b9e..c6652783 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_galileo.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml
@@ -35,9 +35,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.5.1" />
+  <rcp version="3.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-rcp-galileo-SR1" />
+  <product name="eclipse-rcp-helios-M3" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.xml b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
index 5dd1b0be..6d317aa0 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.xml
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Galileo" url="http://download.eclipse.org/releases/galileo/"/>
-      <discovery label="Eclipse Platform 3.5" url="http://download.eclipse.org/eclipse/updates/3.5"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -28,10 +28,10 @@
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.jdt" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.pde" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.5.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.jdt" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.pde" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.wst.xml_ui.feature"/>
       <import feature="org.eclipse.mylyn.ide_feature"/>
       <import feature="org.eclipse.mylyn.java_feature"/>
diff --git a/packages/org.eclipse.epp.package.rcp.feature/p2.inf b/packages/org.eclipse.epp.package.rcp.feature/p2.inf
index e5afc0eb..f4286db4 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.rcp.feature/p2.inf
@@ -8,13 +8,13 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/,name:Mylyn for Eclipse 3.4 and 3.5);\
 org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/,name:Mylyn for Eclipse 3.4 and 3.5);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/);\
 org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/tools/mylyn/update/e3.4/);
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_galileo.xml b/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml
index f619bb4a..cee40eab 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_galileo.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml
@@ -40,9 +40,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.5.1" />
+  <rcp version="3.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-reporting-galileo-SR1" />
+  <product name="eclipse-reporting-helios-M3" />
 
 </configuration>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/feature.xml b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
index b2e57806..76a57d81 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.reporting.feature/feature.xml
@@ -15,8 +15,8 @@
    </license>
 
    <url>
-      <discovery label="Galileo" url="http://download.eclipse.org/releases/galileo/"/>
-      <discovery label="Eclipse Platform 3.5" url="http://download.eclipse.org/eclipse/updates/3.5"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -27,8 +27,8 @@
    <requires>
       <import feature="org.eclipse.cvs" version="1.1.0"/>
       <import feature="org.eclipse.help" version="1.1.0"/>
-      <import feature="org.eclipse.jdt" version="3.5.0"/>
-      <import feature="org.eclipse.platform" version="3.5.0"/>
+      <import feature="org.eclipse.jdt" version="3.6.0"/>
+      <import feature="org.eclipse.platform" version="3.6.0"/>
       <import feature="org.eclipse.mylyn.ide_feature"/>
       <import feature="org.eclipse.mylyn.java_feature"/>
       <import feature="org.eclipse.mylyn.bugzilla_feature"/>
diff --git a/packages/org.eclipse.epp.package.reporting.feature/p2.inf b/packages/org.eclipse.epp.package.reporting.feature/p2.inf
index 9049bf5e..8a961094 100644
--- a/packages/org.eclipse.epp.package.reporting.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.reporting.feature/p2.inf
@@ -8,9 +8,9 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_galileo.xml b/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml
index fb61bcdf..b03a44d7 100644
--- a/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_galileo.xml
+++ b/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml
@@ -35,9 +35,9 @@
 
 	<!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-	<rcp version="3.5.1" />
+	<rcp version="3.6.0" />
 
 	<!-- name, the name of the product, used in naming the created files. -->
-	<product name="eclipse-soa-galileo-SR1-incubation" />
+	<product name="eclipse-soa-helios-M3-incubation" />
 
 </configuration>
\ No newline at end of file
diff --git a/packages/org.eclipse.epp.package.soa.feature/feature.xml b/packages/org.eclipse.epp.package.soa.feature/feature.xml
index d412b314..8030053b 100644
--- a/packages/org.eclipse.epp.package.soa.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.soa.feature/feature.xml
@@ -16,8 +16,8 @@ Note that the SOA package includes some incubating components, as indicated by f
    </license>
 
    <url>
-      <discovery label="Galileo" url="http://download.eclipse.org/releases/galileo/"/>
-      <discovery label="Eclipse Platform 3.5" url="http://download.eclipse.org/eclipse/updates/3.5"/>
+      <discovery label="Helios" url="http://download.eclipse.org/releases/helios/"/>
+      <discovery label="Eclipse Platform 3.6" url="http://download.eclipse.org/eclipse/updates/3.6"/>
    </url>
 
    <includes
@@ -29,8 +29,8 @@ Note that the SOA package includes some incubating components, as indicated by f
       <import feature="org.eclipse.cvs" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.equinox.p2.user.ui" version="1.1.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.help" version="1.1.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.5.0" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rcp" version="3.5.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.6.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="3.6.0" match="greaterOrEqual"/>
       <import feature="org.eclipse.jdt"/>
       <import feature="org.eclipse.pde"/>
       <import feature="org.eclipse.mylyn_feature"/>
diff --git a/packages/org.eclipse.epp.package.soa.feature/p2.inf b/packages/org.eclipse.epp.package.soa.feature/p2.inf
index 9049bf5e..8a961094 100644
--- a/packages/org.eclipse.epp.package.soa.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.soa.feature/p2.inf
@@ -8,9 +8,9 @@ requires.1.name=org.eclipse.platform.ide
 requires.1.greedy=true
 
 instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo,name:EPP Packages Repository);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios,name:EPP Packages Repository);
 
 instructions.unconfigure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);\
-org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/galileo);
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/helios);
\ No newline at end of file
diff --git a/releng/org.eclipse.epp.config/eclipse_sdk_galileo.xml b/releng/org.eclipse.epp.config/eclipse_sdk_galileo.xml
index 0eeb00d8..318050cc 100644
--- a/releng/org.eclipse.epp.config/eclipse_sdk_galileo.xml
+++ b/releng/org.eclipse.epp.config/eclipse_sdk_galileo.xml
@@ -13,7 +13,7 @@
        testPlan is the fully qualified URL to the test plan for this package
    -->
   <packageMetaData
-   packageName="Eclipse Classic 3.5.1"
+   packageName="Eclipse Classic 3.6.0"
    maintainer="Eclipse Platform Team"
    iconurl="http://www.eclipse.org/downloads/images/classic2.jpg"
    bugzillaComponentId=""
@@ -26,7 +26,7 @@
     </packageTesters>
     <FakePackage>True</FakePackage>
     <FakePackageLocation>
-      /eclipse/downloads/drops/R-3.5.1-200909170800/
+      /eclipse/downloads/drops/R-3.6.0-200909170800/
     </FakePackageLocation>
   </packageMetaData>
   <MoreInfo>
@@ -38,9 +38,9 @@
 
   <!-- version, the RCP version to build. This is used to determine the file 
     name of the root file archives -->
-  <rcp version="3.5.1" />
+  <rcp version="3.6.0" />
 
   <!-- name, the name of the product, used in naming the created files. -->
-  <product name="eclipse-SDK-3.5.1" />
+  <product name="eclipse-SDK-3.6.0" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/packages_map.txt b/releng/org.eclipse.epp.config/packages_map.txt
index 66f56f51..4141d2cf 100644
--- a/releng/org.eclipse.epp.config/packages_map.txt
+++ b/releng/org.eclipse.epp.config/packages_map.txt
@@ -5,33 +5,33 @@
 ## 1st: EPP package definition
 ## 2nd: feature.xml renamed
 
-cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_galileo.xml,HEAD,cpp.xml
+cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/eclipse_cpp_helios.xml,HEAD,cpp.xml
 cpp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.cpp.feature/feature.xml,HEAD,cpp.feature.xml
 
-java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/eclipse_java_galileo.xml,HEAD,java.xml
+java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/eclipse_java_helios.xml,HEAD,java.xml
 java,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.java.feature/feature.xml,HEAD,java.feature.xml
 
-jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_galileo.xml,HEAD,jee.xml
+jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/eclipse_jee_helios.xml,HEAD,jee.xml
 jee,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.jee.feature/feature.xml,HEAD,jee.feature.xml
 
-modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_galileo.xml,HEAD,modeling.xml
+modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/eclipse_modeling_helios.xml,HEAD,modeling.xml
 modeling,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.modeling.feature/feature.xml,HEAD,modeling.feature.xml
 
-php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/eclipse_php_galileo.xml,HEAD,php.xml
+php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/eclipse_php_helios.xml,HEAD,php.xml
 php,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.php.feature/feature.xml,HEAD,php.feature.xml
 
-pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_galileo.xml,HEAD,pulsar.xml
+pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/eclipse_pulsar_helios.xml,HEAD,pulsar.xml
 pulsar,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.pulsar.feature/feature.xml,HEAD,pulsar.feature.xml
 
-rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_galileo.xml,HEAD,rcp.xml
+rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/eclipse_rcp_helios.xml,HEAD,rcp.xml
 rcp,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.rcp.feature/feature.xml,HEAD,rcp.feature.xml
 
-reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_galileo.xml,HEAD,reporting.xml
+reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/eclipse_reporting_helios.xml,HEAD,reporting.xml
 reporting,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.reporting.feature/feature.xml,HEAD,reporting.feature.xml
 
-soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_galileo.xml,HEAD,soa.xml
+soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/eclipse_soa_helios.xml,HEAD,soa.xml
 soa,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/packages/org.eclipse.epp.package.soa.feature/feature.xml,HEAD,soa.feature.xml
 
 ## special case - we provide a dummy epp config file for the SDK
-sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_galileo.xml,HEAD,sdk.xml
-#where to get the SDK feature? sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_galileo.xml,HEAD,eclipse_sdk_350.xml
+sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_helios.xml,HEAD,sdk.xml
+#where to get the SDK feature? sdk,CVS,:pserver:anonymous@dev.eclipse.org:/cvsroot/technology,org.eclipse.epp/releng/org.eclipse.epp.config/eclipse_sdk_helios.xml,HEAD,eclipse_sdk_360.xml
diff --git a/releng/org.eclipse.epp.config/startEPP36.sh b/releng/org.eclipse.epp.config/startEPP36.sh
index 70445d60..3c2720ad 100644
--- a/releng/org.eclipse.epp.config/startEPP36.sh
+++ b/releng/org.eclipse.epp.config/startEPP36.sh
@@ -22,14 +22,14 @@ then
    JRE="java"
 fi
 
-# Galileo Repositories
+# Helios Repositories
 REPO_ECLIPSE36="${BASE_URL}/eclipse/updates/3.6milestones/"
 REPO_HELIOS="${BASE_URL}/releases/helios/"
 REPO_STAGING="${BASE_URL}/releases/staging/"
 #REPO_EPP_HELIOS="${BASE_URL}/technology/epp/packages/helios/milestones"
 REPO_EPP_HELIOS="file:///shared/technology/epp/epp_repo/helios/epp.build/buildresult/org.eclipse.epp.allpackages.helios.feature_1.3.0-eclipse.feature/site.p2"
 
-# Repositories (Galileo)
+# Repositories (Helios)
 METADATAREPOSITORIES="${REPO_ECLIPSE36},${REPO_STAGING},${REPO_EPP_HELIOS}"
 ARTIFACTREPOSITORIES="${REPO_ECLIPSE36},${REPO_STAGING},${REPO_EPP_HELIOS}"
 
@@ -52,7 +52,7 @@ MARKERFILENAME=".epp.nightlybuild"
 STATUSFILENAME="status.stub"
 CVSPATH="org.eclipse.epp/releng/org.eclipse.epp.config"
 CVSPROJECTPATH="org.eclipse.epp/packages"
-RELEASE_NAME="-helios-M2"
+RELEASE_NAME="-helios-M3"
 
 ###############################################################################
 
diff --git a/releng/org.eclipse.epp.config/tools/releaseRename.sh b/releng/org.eclipse.epp.config/tools/releaseRename.sh
index 261be1e2..84efa622 100644
--- a/releng/org.eclipse.epp.config/tools/releaseRename.sh
+++ b/releng/org.eclipse.epp.config/tools/releaseRename.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 RELEASEDIRECTORY=/home/data/httpd/download.eclipse.org/technology/epp/downloads/release
-TESTDIRECTORY=/shared/technology/epp/epp_build/35/download
-RELEASETRAIN=galileo
+TESTDIRECTORY=/shared/technology/epp/epp_build/36/download
+RELEASETRAIN=helios
 CURRENTDIR=${PWD}