37 files changed, 17 insertions, 17 deletions
diff --git a/features/org.eclipse.epp.allpackages.feature/feature.xml b/features/org.eclipse.epp.allpackages.feature/feature.xml
index 0a8dee5e..f2f75b76 100644
--- a/features/org.eclipse.epp.allpackages.feature/feature.xml
+++ b/features/org.eclipse.epp.allpackages.feature/feature.xml
@@ -22,10 +22,6 @@
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.epp.package.classic.feature"
-         version="0.0.0"/>
-
-   <includes
          id="org.eclipse.epp.package.common.feature"
          version="0.0.0"/>
 
@@ -58,6 +54,10 @@
          version="0.0.0"/>
 
    <includes
+         id="org.eclipse.epp.package.standard.feature"
+         version="0.0.0"/>
+
+   <includes
          id="org.eclipse.epp.package.testing.feature"
          version="0.0.0"/>
 
diff --git a/packages/org.eclipse.epp.package.classic.feature/.project b/packages/org.eclipse.epp.package.standard.feature/.project
index 21bc9fd2..f2e9909e 100644
--- a/packages/org.eclipse.epp.package.classic.feature/.project
+++ b/packages/org.eclipse.epp.package.standard.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.epp.package.classic.feature</name>
+	<name>org.eclipse.epp.package.standard.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/packages/org.eclipse.epp.package.classic.feature/build.properties b/packages/org.eclipse.epp.package.standard.feature/build.properties
index b094c48e..b094c48e 100644
--- a/packages/org.eclipse.epp.package.classic.feature/build.properties
+++ b/packages/org.eclipse.epp.package.standard.feature/build.properties
diff --git a/packages/org.eclipse.epp.package.classic.feature/epl-v10.html b/packages/org.eclipse.epp.package.standard.feature/epl-v10.html
index 3998fceb..3998fceb 100644
--- a/packages/org.eclipse.epp.package.classic.feature/epl-v10.html
+++ b/packages/org.eclipse.epp.package.standard.feature/epl-v10.html
diff --git a/packages/org.eclipse.epp.package.classic.feature/epp.product b/packages/org.eclipse.epp.package.standard.feature/epp.product
index f538172c..f51b9a61 100644
--- a/packages/org.eclipse.epp.package.classic.feature/epp.product
+++ b/packages/org.eclipse.epp.package.standard.feature/epp.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Eclipse Standard/SDK" uid="epp.package.classic" id="org.eclipse.epp.package.classic.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Standard/SDK" uid="epp.package.standard" id="org.eclipse.epp.package.standard.product" application="org.eclipse.ui.ide.workbench" version="2.0.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <text>
@@ -13,7 +13,7 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>-product org.eclipse.epp.package.classic.product
+      <programArgs>-product org.eclipse.epp.package.standard.product
 --launcher.defaultAction openFile</programArgs>
       <programArgsWin>--launcher.XXMaxPermSize
 256M</programArgsWin>
@@ -25,7 +25,7 @@
 -XX:MaxPermSize=256m</vmArgsMac>
    </launcherArgs>
 
-   <windowImages i16="/org.eclipse.epp.package.classic/eclipse16.png" i32="/org.eclipse.epp.package.classic/eclipse32.png" i48="/org.eclipse.epp.package.classic/eclipse48.png"/>
+   <windowImages i16="/org.eclipse.epp.package.standard/eclipse16.png" i32="/org.eclipse.epp.package.standard/eclipse32.png" i48="/org.eclipse.epp.package.standard/eclipse48.png"/>
 
    <splash
       startupProgressRect="0,280,455,15"
@@ -48,11 +48,11 @@
    </vm>
 
    <plugins>
-      <plugin id="org.eclipse.epp.package.classic"/>
+      <plugin id="org.eclipse.epp.package.standard"/>
    </plugins>
 
    <features>
-      <feature id="org.eclipse.epp.package.classic.feature" version="2.0.0.qualifier"/>
+      <feature id="org.eclipse.epp.package.standard.feature" version="2.0.0.qualifier"/>
    </features>
 
 
diff --git a/packages/org.eclipse.epp.package.classic.feature/epp.website.xml b/packages/org.eclipse.epp.package.standard.feature/epp.website.xml
index 3490ff1b..3490ff1b 100644
--- a/packages/org.eclipse.epp.package.classic.feature/epp.website.xml
+++ b/packages/org.eclipse.epp.package.standard.feature/epp.website.xml
diff --git a/packages/org.eclipse.epp.package.classic.feature/feature.properties b/packages/org.eclipse.epp.package.standard.feature/feature.properties
index 026d2fee..026d2fee 100644
--- a/packages/org.eclipse.epp.package.classic.feature/feature.properties
+++ b/packages/org.eclipse.epp.package.standard.feature/feature.properties
diff --git a/packages/org.eclipse.epp.package.classic.feature/feature.xml b/packages/org.eclipse.epp.package.standard.feature/feature.xml
index 61316845..239cd7c1 100644
--- a/packages/org.eclipse.epp.package.classic.feature/feature.xml
+++ b/packages/org.eclipse.epp.package.standard.feature/feature.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.epp.package.classic.feature"
+      id="org.eclipse.epp.package.standard.feature"
       label="Eclipse Standard/SDK Feature"
       version="2.0.0.qualifier"
       provider-name="Eclipse Packaging Project"
-      plugin="org.eclipse.epp.package.classic">
+      plugin="org.eclipse.epp.package.standard">
 
    <description>
       The Eclipse Platform, and all the tools needed to develop and debug it: Java and Plug-in Development Tooling, Git and CVS support, including source and developer documentation.
@@ -44,7 +44,7 @@
    </requires>
 
    <plugin
-         id="org.eclipse.epp.package.classic"
+         id="org.eclipse.epp.package.standard"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
diff --git a/packages/org.eclipse.epp.package.classic.feature/license.html b/packages/org.eclipse.epp.package.standard.feature/license.html
index f19c483b..f19c483b 100644
--- a/packages/org.eclipse.epp.package.classic.feature/license.html
+++ b/packages/org.eclipse.epp.package.standard.feature/license.html
diff --git a/packages/org.eclipse.epp.package.classic.feature/p2.inf b/packages/org.eclipse.epp.package.standard.feature/p2.inf
index 8787b056..8787b056 100644
--- a/packages/org.eclipse.epp.package.classic.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.standard.feature/p2.inf
diff --git a/packages/org.eclipse.epp.package.classic/.project b/packages/org.eclipse.epp.package.standard/.project
index 09ce633f..152ee02d 100644
--- a/packages/org.eclipse.epp.package.classic/.project
+++ b/packages/org.eclipse.epp.package.standard/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.epp.package.classic</name>
+	<name>org.eclipse.epp.package.standard</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/packages/org.eclipse.epp.package.classic/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.standard/META-INF/MANIFEST.MF
index cfcc720d..cfcc720d 100644
--- a/packages/org.eclipse.epp.package.classic/META-INF/MANIFEST.MF
+++ b/packages/org.eclipse.epp.package.standard/META-INF/MANIFEST.MF
diff --git a/packages/org.eclipse.epp.package.classic/about.html b/packages/org.eclipse.epp.package.standard/about.html
index e6ecf1e5..e6ecf1e5 100644
--- a/packages/org.eclipse.epp.package.classic/about.html
+++ b/packages/org.eclipse.epp.package.standard/about.html
diff --git a/packages/org.eclipse.epp.package.classic/about.ini b/packages/org.eclipse.epp.package.standard/about.ini
index bb688616..bb688616 100644
--- a/packages/org.eclipse.epp.package.classic/about.ini
+++ b/packages/org.eclipse.epp.package.standard/about.ini
diff --git a/packages/org.eclipse.epp.package.classic/about.mappings b/packages/org.eclipse.epp.package.standard/about.mappings
index a28390a7..a28390a7 100644
--- a/packages/org.eclipse.epp.package.classic/about.mappings
+++ b/packages/org.eclipse.epp.package.standard/about.mappings
diff --git a/packages/org.eclipse.epp.package.classic/about.properties b/packages/org.eclipse.epp.package.standard/about.properties
index 94a32d49..94a32d49 100644
--- a/packages/org.eclipse.epp.package.classic/about.properties
+++ b/packages/org.eclipse.epp.package.standard/about.properties
diff --git a/packages/org.eclipse.epp.package.classic/book.css b/packages/org.eclipse.epp.package.standard/book.css
index b337d94c..b337d94c 100644
--- a/packages/org.eclipse.epp.package.classic/book.css
+++ b/packages/org.eclipse.epp.package.standard/book.css
diff --git a/packages/org.eclipse.epp.package.classic/build.properties b/packages/org.eclipse.epp.package.standard/build.properties
index 32ba63cd..32ba63cd 100644
--- a/packages/org.eclipse.epp.package.classic/build.properties
+++ b/packages/org.eclipse.epp.package.standard/build.properties
diff --git a/packages/org.eclipse.epp.package.classic/disabled_book.css b/packages/org.eclipse.epp.package.standard/disabled_book.css
index 5abd0041..5abd0041 100644
--- a/packages/org.eclipse.epp.package.classic/disabled_book.css
+++ b/packages/org.eclipse.epp.package.standard/disabled_book.css
diff --git a/packages/org.eclipse.epp.package.classic/eclipse16.gif b/packages/org.eclipse.epp.package.standard/eclipse16.gif
index abefafcb..abefafcb 100644
--- a/packages/org.eclipse.epp.package.classic/eclipse16.gif
+++ b/packages/org.eclipse.epp.package.standard/eclipse16.gif
diff --git a/packages/org.eclipse.epp.package.classic/eclipse16.png b/packages/org.eclipse.epp.package.standard/eclipse16.png
index 8bd31d1c..8bd31d1c 100644
--- a/packages/org.eclipse.epp.package.classic/eclipse16.png
+++ b/packages/org.eclipse.epp.package.standard/eclipse16.png
diff --git a/packages/org.eclipse.epp.package.classic/eclipse256.png b/packages/org.eclipse.epp.package.standard/eclipse256.png
index 941ab0b3..941ab0b3 100644
--- a/packages/org.eclipse.epp.package.classic/eclipse256.png
+++ b/packages/org.eclipse.epp.package.standard/eclipse256.png
diff --git a/packages/org.eclipse.epp.package.classic/eclipse32.gif b/packages/org.eclipse.epp.package.standard/eclipse32.gif
index 29edaa00..29edaa00 100644
--- a/packages/org.eclipse.epp.package.classic/eclipse32.gif
+++ b/packages/org.eclipse.epp.package.standard/eclipse32.gif
diff --git a/packages/org.eclipse.epp.package.classic/eclipse32.png b/packages/org.eclipse.epp.package.standard/eclipse32.png
index 71ea8f9b..71ea8f9b 100644
--- a/packages/org.eclipse.epp.package.classic/eclipse32.png
+++ b/packages/org.eclipse.epp.package.standard/eclipse32.png
diff --git a/packages/org.eclipse.epp.package.classic/eclipse48.gif b/packages/org.eclipse.epp.package.standard/eclipse48.gif
index ba596ce3..ba596ce3 100644
--- a/packages/org.eclipse.epp.package.classic/eclipse48.gif
+++ b/packages/org.eclipse.epp.package.standard/eclipse48.gif
diff --git a/packages/org.eclipse.epp.package.classic/eclipse48.png b/packages/org.eclipse.epp.package.standard/eclipse48.png
index 6845e673..6845e673 100644
--- a/packages/org.eclipse.epp.package.classic/eclipse48.png
+++ b/packages/org.eclipse.epp.package.standard/eclipse48.png
diff --git a/packages/org.eclipse.epp.package.classic/eclipse_lg.gif b/packages/org.eclipse.epp.package.standard/eclipse_lg.gif
index c004bf24..c004bf24 100644
--- a/packages/org.eclipse.epp.package.classic/eclipse_lg.gif
+++ b/packages/org.eclipse.epp.package.standard/eclipse_lg.gif
diff --git a/packages/org.eclipse.epp.package.classic/eppfeature32.png b/packages/org.eclipse.epp.package.standard/eppfeature32.png
index 568fac1d..568fac1d 100644
--- a/packages/org.eclipse.epp.package.classic/eppfeature32.png
+++ b/packages/org.eclipse.epp.package.standard/eppfeature32.png
diff --git a/packages/org.eclipse.epp.package.classic/helpData.xml b/packages/org.eclipse.epp.package.standard/helpData.xml
index 0838605a..0838605a 100644
--- a/packages/org.eclipse.epp.package.classic/helpData.xml
+++ b/packages/org.eclipse.epp.package.standard/helpData.xml
diff --git a/packages/org.eclipse.epp.package.classic/intro-eclipse.png b/packages/org.eclipse.epp.package.standard/intro-eclipse.png
index 015e7fc6..015e7fc6 100644
--- a/packages/org.eclipse.epp.package.classic/intro-eclipse.png
+++ b/packages/org.eclipse.epp.package.standard/intro-eclipse.png
diff --git a/packages/org.eclipse.epp.package.classic/introData.xml b/packages/org.eclipse.epp.package.standard/introData.xml
index 2b1c002b..2b1c002b 100644
--- a/packages/org.eclipse.epp.package.classic/introData.xml
+++ b/packages/org.eclipse.epp.package.standard/introData.xml
diff --git a/packages/org.eclipse.epp.package.classic/macosx_narrow_book.css b/packages/org.eclipse.epp.package.standard/macosx_narrow_book.css
index 344e5e48..344e5e48 100644
--- a/packages/org.eclipse.epp.package.classic/macosx_narrow_book.css
+++ b/packages/org.eclipse.epp.package.standard/macosx_narrow_book.css
diff --git a/packages/org.eclipse.epp.package.classic/narrow_book.css b/packages/org.eclipse.epp.package.standard/narrow_book.css
index 09a9aa1d..09a9aa1d 100644
--- a/packages/org.eclipse.epp.package.classic/narrow_book.css
+++ b/packages/org.eclipse.epp.package.standard/narrow_book.css
diff --git a/packages/org.eclipse.epp.package.classic/plugin.properties b/packages/org.eclipse.epp.package.standard/plugin.properties
index eb6d9821..eb6d9821 100644
--- a/packages/org.eclipse.epp.package.classic/plugin.properties
+++ b/packages/org.eclipse.epp.package.standard/plugin.properties
diff --git a/packages/org.eclipse.epp.package.classic/plugin.xml b/packages/org.eclipse.epp.package.standard/plugin.xml
index 949600d5..031422fe 100644
--- a/packages/org.eclipse.epp.package.classic/plugin.xml
+++ b/packages/org.eclipse.epp.package.standard/plugin.xml
@@ -87,7 +87,7 @@
          point="org.eclipse.ui.intro">
       <introProductBinding
             introId="org.eclipse.ui.intro.universal"
-            productId="org.eclipse.epp.package.classic.product">
+            productId="org.eclipse.epp.package.standard.product">
       </introProductBinding>
    </extension>
    
@@ -338,7 +338,7 @@
    
    <extension
    		point="org.eclipse.help.base.activitySupport">
-      <support productId="org.eclipse.epp.package.classic.product">
+      <support productId="org.eclipse.epp.package.standard.product">
          <showAllMessage>
             %helpActivitySupport.showAllMessage
          </showAllMessage>
@@ -369,7 +369,7 @@
    <extension
          point="org.eclipse.ui.activitySupport">
       <triggerPointAdvisorProductBinding
-            productId="org.eclipse.epp.package.classic.product"
+            productId="org.eclipse.epp.package.standard.product"
             triggerPointAdvisorId="org.eclipse.ui.ide.triggerPointAdvisor"/>
    </extension>
    
diff --git a/packages/org.eclipse.epp.package.classic/plugin_customization.ini b/packages/org.eclipse.epp.package.standard/plugin_customization.ini
index eaf128d7..eaf128d7 100644
--- a/packages/org.eclipse.epp.package.classic/plugin_customization.ini
+++ b/packages/org.eclipse.epp.package.standard/plugin_customization.ini
diff --git a/packages/org.eclipse.epp.package.classic/plugin_customization.properties b/packages/org.eclipse.epp.package.standard/plugin_customization.properties
index 4943101c..4943101c 100644
--- a/packages/org.eclipse.epp.package.classic/plugin_customization.properties
+++ b/packages/org.eclipse.epp.package.standard/plugin_customization.properties