diff --git a/features/org.eclipse.wtp.package.jee.feature/.project b/features/org.eclipse.wtp.package.jee.feature/.project
index 766c891..72520c2 100644
--- a/features/org.eclipse.wtp.package.jee.feature/.project
+++ b/features/org.eclipse.wtp.package.jee.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.wtp.package.jee.feature</name>
+	<name>org.eclipse.wtp.jee.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/features/org.eclipse.wtp.package.jee.feature/build.properties b/features/org.eclipse.wtp.package.jee.feature/build.properties
index a45c41c..48df860 100644
--- a/features/org.eclipse.wtp.package.jee.feature/build.properties
+++ b/features/org.eclipse.wtp.package.jee.feature/build.properties
@@ -3,5 +3,6 @@
                feature.properties,\
                epl-v10.html,\
                p2.inf,\
-               wtp.jee.product
+               wtp.jee.product,\
+               plugin_customization.ini
 includeLaunchers = false
diff --git a/features/org.eclipse.wtp.package.jee.feature/feature.xml b/features/org.eclipse.wtp.package.jee.feature/feature.xml
index 3696c75..88cfa3b 100644
--- a/features/org.eclipse.wtp.package.jee.feature/feature.xml
+++ b/features/org.eclipse.wtp.package.jee.feature/feature.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.wtp.package.jee.feature"
+      id="org.eclipse.wtp.jee.feature"
       label="%featureName"
       version="3.1.0.qualifier"
       provider-name="%providerName"
-      plugin="org.eclipse.wtp.package.jee">
+      plugin="org.eclipse.wtp.jee">
 
    <description>
       %description
@@ -65,7 +65,7 @@
    </requires>
 
    <plugin
-         id="org.eclipse.wtp.package.jee"
+         id="org.eclipse.wtp.jee"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
@@ -77,28 +77,4 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.wtp.javascript.capabilities"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wtp.jee.capabilities"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wtp.web.capabilities"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wtp.xml.capabilities"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
 </feature>
diff --git a/features/org.eclipse.wtp.package.jee.feature/plugin_customization.ini b/features/org.eclipse.wtp.package.jee.feature/plugin_customization.ini
new file mode 100644
index 0000000..333fab9
--- /dev/null
+++ b/features/org.eclipse.wtp.package.jee.feature/plugin_customization.ini
@@ -0,0 +1 @@
+org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
diff --git a/features/org.eclipse.wtp.package.jee.feature/wtp.jee.product b/features/org.eclipse.wtp.package.jee.feature/wtp.jee.product
index 96b66ec..88c8465 100644
--- a/features/org.eclipse.wtp.package.jee.feature/wtp.jee.product
+++ b/features/org.eclipse.wtp.package.jee.feature/wtp.jee.product
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="Java EE Developer Tools" uid="wtp.package.jee" id="org.eclipse.wtp.package.jee.product" application="org.eclipse.ui.ide.workbench" version="3.1.0" useFeatures="true" includeLaunchers="false">
+<product name="Java EE Developer Tools" uid="org.eclipse.wtp.jee" id="org.eclipse.wtp.jee.ide" application="org.eclipse.ui.ide.workbench" version="3.1.0" useFeatures="true" includeLaunchers="false">
 
    <aboutInfo>
-      <image path="/org.eclipse.wtp.package.jee/about_gears.gif"/>
+      <image path="/org.eclipse.wtp.jee/about_gears.gif"/>
       <text>
          Eclipse Java EE Developer Tools
       </text>
@@ -14,7 +14,7 @@
    </configIni>
 
    <launcherArgs>
-      <programArgs>-product org.eclipse.wtp.package.jee.product</programArgs>
+      <programArgs>-product org.eclipse.wtp.jee</programArgs>
       <programArgsWin>--launcher.XXMaxPermSize
 256M</programArgsWin>
       <vmArgs>-Dosgi.requiredJavaVersion=1.5
@@ -25,10 +25,10 @@
 -XX:MaxPermSize=256m</vmArgsMac>
    </launcherArgs>
 
-   <windowImages i16="/org.eclipse.wtp.package.jee/WTP_icon_x16_v2.png" i32="/org.eclipse.wtp.package.jee/WTP_icon_x32_v2.png"/>
+   <windowImages i16="/org.eclipse.wtp.jee/WTP_icon_x16_v2.png" i32="/org.eclipse.wtp.jee/WTP_icon_x32_v2.png"/>
 
    <splash
-      location="org.eclipse.wtp.package.jee"
+      location="org.eclipse.wtp.jee"
       startupProgressRect="5,275,445,15"
       startupMessageRect="7,252,445,20"
       startupForegroundColor="000000" />
@@ -153,11 +153,11 @@
 
    <plugins>
       <plugin id="org.eclipse.wtp.intro"/>
-      <plugin id="org.eclipse.wtp.package.jee"/>
+      <plugin id="org.eclipse.wtp.jee"/>
    </plugins>
 
    <features>
-      <feature id="org.eclipse.wtp.package.jee.feature" version="3.1.0.qualifier"/>
+      <feature id="org.eclipse.wtp.jee.feature" version="3.1.0.qualifier"/>
    </features>
 
 
diff --git a/plugins/org.eclipse.wtp.intro/plugin.xml b/plugins/org.eclipse.wtp.intro/plugin.xml
index f02f8b8..89c5423 100644
--- a/plugins/org.eclipse.wtp.intro/plugin.xml
+++ b/plugins/org.eclipse.wtp.intro/plugin.xml
@@ -15,7 +15,7 @@
       </intro>
       <introProductBinding
             introId="org.eclipse.wtp.intro.intro"
-            productId="org.eclipse.wtp.package.jee.product">
+            productId="org.eclipse.wtp.jee.ide">
       </introProductBinding>
    </extension>
    
diff --git a/plugins/org.eclipse.wtp.package.jee/.project b/plugins/org.eclipse.wtp.package.jee/.project
index 8c9e4c1..38bc2cf 100644
--- a/plugins/org.eclipse.wtp.package.jee/.project
+++ b/plugins/org.eclipse.wtp.package.jee/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.wtp.package.jee</name>
+	<name>org.eclipse.wtp.jee</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/plugins/org.eclipse.wtp.package.jee/META-INF/MANIFEST.MF b/plugins/org.eclipse.wtp.package.jee/META-INF/MANIFEST.MF
index 3ff459d..d141414 100644
--- a/plugins/org.eclipse.wtp.package.jee/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wtp.package.jee/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.eclipse.wtp.package.jee;singleton:=true
+Bundle-SymbolicName: org.eclipse.wtp.jee;singleton:=true
 Bundle-Version: 3.1.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.platform,
diff --git a/plugins/org.eclipse.wtp.package.jee/OSGI-INF/l10n/bundle.properties b/plugins/org.eclipse.wtp.package.jee/OSGI-INF/l10n/bundle.properties
index 32a94fe..1229f64 100644
--- a/plugins/org.eclipse.wtp.package.jee/OSGI-INF/l10n/bundle.properties
+++ b/plugins/org.eclipse.wtp.package.jee/OSGI-INF/l10n/bundle.properties
@@ -1,3 +1,3 @@
-#Properties file for org.eclipse.wtp.package.jee
+#Properties file for org.eclipse.wtp.jee
 Bundle-Name = Java EE Developer Tools
 Bundle-Vendor = Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/plugins/org.eclipse.wtp.package.jee/plugin.xml b/plugins/org.eclipse.wtp.package.jee/plugin.xml
index 229a5ca..c23677c 100644
--- a/plugins/org.eclipse.wtp.package.jee/plugin.xml
+++ b/plugins/org.eclipse.wtp.package.jee/plugin.xml
@@ -2,7 +2,8 @@
 <?eclipse version="3.4"?>
 <plugin>
    <extension
-         id="product"
+         id="ide"
+         name="Java EE Developer Tools"
          point="org.eclipse.core.runtime.products">
       <product
             application="org.eclipse.ui.ide.workbench"
@@ -14,7 +15,7 @@
          </property>
          <property
                name="appName"
-               value="Eclipse">
+               value="Java EE Developer Tools">
          </property>
          <property
                name="aboutText"