--- a/java/org/apache/naming/factory/Constants.java
+++ b/java/org/apache/naming/factory/Constants.java
@@ -49,7 +49,7 @@
         Package + ".HandlerFactory";
 
     public static final String DBCP_DATASOURCE_FACTORY = 
-        "org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory";
+        "org.apache.commons.dbcp.BasicDataSourceFactory";
 
     public static final String OPENEJB_EJB_FACTORY = 
         Package + ".OpenEjbFactory";
--- a/webapps/docs/jndi-resources-howto.xml
+++ b/webapps/docs/jndi-resources-howto.xml
@@ -653,9 +653,9 @@
     <code>driverName</code> parameters to match your actual database's
     JDBC driver and connection URL.</p>
 
-    <p>The configuration properties for Tomcat's standard data source
+    <p>The configuration properties for our default data source
     resource factory
-    (<code>org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory</code>) are
+    (<code>org.apache.commons.dbcp.BasicDataSourceFactory</code>) are
     as follows:</p>
     <ul>
     <li><strong>driverClassName</strong> - Fully qualified Java class name
