Replace bsddb3 and _db occurrences.
diff --git a/Lib/bsddb/db.py b/Lib/bsddb/db.py
index b4365d0..c1749df 100644
--- a/Lib/bsddb/db.py
+++ b/Lib/bsddb/db.py
@@ -37,8 +37,8 @@
 # case we ever want to augment the stuff in _db in any way.  For now
 # it just simply imports everything from _db.
 
-from _db import *
-from _db import __version__
+from _bsddb import *
+from _bsddb import __version__
 
 if version() < (3, 1, 0):
     raise ImportError, "BerkeleyDB 3.x symbols not found.  Perhaps python was statically linked with an older version?"
diff --git a/Lib/bsddb/dbshelve.py b/Lib/bsddb/dbshelve.py
index ce4a466..ab63636 100644
--- a/Lib/bsddb/dbshelve.py
+++ b/Lib/bsddb/dbshelve.py
@@ -31,7 +31,7 @@
 #------------------------------------------------------------------------
 
 import cPickle
-from bsddb3 import db
+from bsddb import db
 
 #------------------------------------------------------------------------
 
diff --git a/Lib/bsddb/dbtables.py b/Lib/bsddb/dbtables.py
index 4e93451..f1e88f2 100644
--- a/Lib/bsddb/dbtables.py
+++ b/Lib/bsddb/dbtables.py
@@ -28,7 +28,7 @@
 import re
 import copy
 
-from bsddb3.db import *
+from bsddb.db import *
 
 
 class TableDBError(StandardError): pass