diff --git a/releng/org.eclipse.rse.build/customTargets.xml b/releng/org.eclipse.rse.build/customTargets.xml
index ab287a80341..255c36b9ade 100644
--- a/releng/org.eclipse.rse.build/customTargets.xml
+++ b/releng/org.eclipse.rse.build/customTargets.xml
@@ -12,7 +12,7 @@
 		</ant>
 		<ant antfile="${genericTargets}" target="${target}">
 			<property name="type" value="feature" />
-			<property name="id" value="org.apache.commons_net" />
+			<property name="id" value="org.apache.commons.net" />
 		</ant>
 		-->
 		<ant antfile="${genericTargets}" target="${target}">
@@ -70,7 +70,7 @@
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
 	</target>
-	<target name="assemble.org.apache.commons_net">
+	<target name="assemble.org.apache.commons.net">
 		<property name="archiveName" value="commons-net-${buildId}.zip"/>
 		<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
 		<antcall target="unpackUpdateJarsForPackaging" />
diff --git a/releng/org.eclipse.rse.build/maps/tmcore.map b/releng/org.eclipse.rse.build/maps/tmcore.map
index 34e65f47652..d55d330c3fc 100644
--- a/releng/org.eclipse.rse.build/maps/tmcore.map
+++ b/releng/org.eclipse.rse.build/maps/tmcore.map
@@ -1,4 +1,4 @@
-feature@org.apache.commons_net=v20061020,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.commons_net-feature
+feature@org.apache.commons.net=v20061020,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.commons.net-feature
 feature@org.apache.oro=v20061020,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.oro-feature
-plugin@org.apache.commons_net=v20061020,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.commons_net
+plugin@org.apache.commons.net=v20061020,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.commons.net
 plugin@org.apache.oro=v20061020,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.core/thirdparty/org.apache.oro
\ No newline at end of file
diff --git a/releng/org.eclipse.rse.updatesite/site.xml b/releng/org.eclipse.rse.updatesite/site.xml
index 7ce744d72ec..f3c86613b88 100644
--- a/releng/org.eclipse.rse.updatesite/site.xml
+++ b/releng/org.eclipse.rse.updatesite/site.xml
@@ -34,7 +34,7 @@
    <feature url="features/org.eclipse.tm.discovery_1.0.0.qualifier.jar" id="org.eclipse.tm.discovery" version="1.0.0.qualifier">
       <category name="RSE Experimental Add-ons"/>
    </feature>
-   <feature url="features/org.apache.commons_net_1.4.1.qualifier.jar" id="org.apache.commons_net" version="1.4.1.qualifier">
+   <feature url="features/org.apache.commons_net_1.4.1.qualifier.jar" id="org.apache.commons.net" version="1.4.1.qualifier">
       <category name="Enabling Features"/>
    </feature>
    <feature url="features/org.apache.oro_2.0.8.qualifier.jar" id="org.apache.oro" version="2.0.8.qualifier">
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index fe3226995fa..446a24b01ca 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -24,7 +24,7 @@
    </url>
 
    <includes
-         id="org.apache.commons_net"
+         id="org.apache.commons.net"
          version="0.0.0"/>
 
    <includes
diff --git a/rse/features/org.eclipse.rse.sdk-feature/build.properties b/rse/features/org.eclipse.rse.sdk-feature/build.properties
index dbb3ce4155c..40a5e6b95fe 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/build.properties
+++ b/rse/features/org.eclipse.rse.sdk-feature/build.properties
@@ -12,7 +12,7 @@ bin.includes = feature.xml,\
                license.html,\
                feature.properties,\
                epl-v10.html
-generate.feature@org.apache.commons_net.source=org.apache.commons_net
+generate.feature@org.apache.commons.net.source=org.apache.commons.net
 generate.feature@org.apache.oro.source=org.apache.oro
 generate.feature@org.eclipse.rse.local.source=org.eclipse.rse.local
 generate.feature@org.eclipse.rse.ftp.source=org.eclipse.rse.ftp
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index b383ba29b65..fb86bffc52e 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -50,7 +50,7 @@
          version="0.0.0"/>
 
    <includes
-         id="org.apache.commons_net.source"
+         id="org.apache.commons.net.source"
          version="0.0.0"/>
 
    <includes
diff --git a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
index 3395fc1904d..c8b6f242a67 100644
--- a/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
+++ b/rse/plugins/org.eclipse.rse.services.files.ftp/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rse.services,
- org.apache.commons_net
+ org.apache.commons.net
 Eclipse-LazyStart: true
 Export-Package: org.eclipse.rse.services.files.ftp