diff --git a/pmd-eclipse-plugin/custom_build.properties b/pmd-eclipse-plugin/custom_build.properties
index 5d97c26677..c948e7ef83 100644
--- a/pmd-eclipse-plugin/custom_build.properties
+++ b/pmd-eclipse-plugin/custom_build.properties
@@ -1,4 +1,4 @@
-topLevelElementId = net.sourceforge.pmd.eclipse.feature
+topLevelElementId = net.sourceforge.pmd.eclipse
 outputUpdateJars = true
 buildDirectory=buildDir
 baseLocation=/usr/java/eclipse
diff --git a/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/.classpath b/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/.classpath
similarity index 100%
rename from pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/.classpath
rename to pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/.classpath
diff --git a/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/.project b/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/.project
similarity index 87%
rename from pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/.project
rename to pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/.project
index e01b4158f4..5fb145d1f7 100644
--- a/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/.project
+++ b/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.sourceforge.pmd.eclipse.feature</name>
+	<name>net.sourceforge.pmd.eclipse</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/.settings/org.eclipse.jdt.core.prefs b/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/.settings/org.eclipse.jdt.core.prefs
rename to pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/.settings/org.eclipse.jdt.core.prefs
diff --git a/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/build.properties b/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/build.properties
similarity index 100%
rename from pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/build.properties
rename to pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/build.properties
diff --git a/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/feature.properties b/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/feature.properties
similarity index 100%
rename from pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/feature.properties
rename to pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/feature.properties
diff --git a/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/feature.xml b/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/feature.xml
similarity index 88%
rename from pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/feature.xml
rename to pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/feature.xml
index 9cb20483c7..2af3e70e0c 100644
--- a/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/feature.xml
+++ b/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/feature.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="net.sourceforge.pmd.eclipse.feature"
+      id="net.sourceforge.pmd.eclipse"
       label="%feature.label"
-      version="3.2.5.v200809252215"
+      version="3.2.5.v200809252340"
       provider-name="%feature.provider_name"
       image="pmd_logo_small.jpg">
 
@@ -35,7 +35,7 @@
          id="net.sourceforge.pmd.eclipse.plugin"
          download-size="0"
          install-size="0"
-         version="3.2.5.v200809252215"
+         version="3.2.5.v200809252340"
          unpack="false"
 	/>
 
diff --git a/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/pmd_logo_small.jpg b/pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/pmd_logo_small.jpg
similarity index 100%
rename from pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse.feature/pmd_logo_small.jpg
rename to pmd-eclipse-plugin/features/net.sourceforge.pmd.eclipse/pmd_logo_small.jpg
diff --git a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF
index 5c2ffda1f9..125d911844 100644
--- a/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF
+++ b/pmd-eclipse-plugin/plugins/net.sourceforge.pmd.eclipse.plugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: net.sourceforge.pmd.eclipse.plugin;singleton:=true
-Bundle-Version: 3.2.5.v200809252215
+Bundle-Version: 3.2.5.v200809252340
 Bundle-Activator: net.sourceforge.pmd.eclipse.plugin.PMDActivator
 Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0",
  org.eclipse.core.runtime,
diff --git a/pmd-eclipse-plugin/pmd-eclipse-test/plugin.xml b/pmd-eclipse-plugin/pmd-eclipse-test/plugin.xml
index 5a9de4237e..53afd1761e 100644
--- a/pmd-eclipse-plugin/pmd-eclipse-test/plugin.xml
+++ b/pmd-eclipse-plugin/pmd-eclipse-test/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.pmd.eclipse.test"
    name="PMD Eclipse Test Plug-in"
-   version="3.2.5.v200809252215"
+   version="3.2.5.v200809252340"
    provider-name="PMD Development Team">
 
    <runtime>