diff --git a/comps-f17.xml.in b/comps-f17.xml.in
index 2c2849c8..af4a050a 100644
--- a/comps-f17.xml.in
+++ b/comps-f17.xml.in
@@ -3541,7 +3541,7 @@
       <packagereq type="default">avalon-framework</packagereq>
       <packagereq type="default">avalon-logkit</packagereq>
       <packagereq type="default">bcel</packagereq>
-      <packagereq type="default">classpathx-mail</packagereq>
+      <packagereq type="default">javamail</packagereq>
       <packagereq type="default">gnu-getopt</packagereq>
       <packagereq type="default">jakarta-oro</packagereq>
       <packagereq type="default">jakarta-taglibs-standard</packagereq>
@@ -3554,7 +3554,7 @@
       <packagereq type="default">junit</packagereq>
       <packagereq type="default">ldapjdk</packagereq>
       <packagereq type="default">log4j</packagereq>
-      <packagereq type="default">maven2</packagereq>
+      <packagereq type="default">maven</packagereq>
       <packagereq type="default">mx4j</packagereq>
       <packagereq type="default">regexp</packagereq>
       <packagereq type="default">xalan-j2</packagereq>