diff --git a/SQLite.xs b/SQLite.xs
index 2d24931..c009e88 100644
--- a/SQLite.xs
+++ b/SQLite.xs
@@ -34,7 +34,7 @@ create_function(dbh, name, argc, func)
         DBD::SQLite::db::sqlite_create_function = 1
     CODE:
     {
-        RETVAL = sqlite3_db_create_function(aTHX_ dbh, name, argc, func );
+        RETVAL = sqlite_db_create_function(aTHX_ dbh, name, argc, func );
     }
     OUTPUT:
         RETVAL
@@ -47,7 +47,7 @@ enable_load_extension(dbh, onoff)
         DBD::SQLite::db::sqlite_enable_load_extension = 1
     CODE:
     {
-        RETVAL = sqlite3_db_enable_load_extension(aTHX_ dbh, onoff );
+        RETVAL = sqlite_db_enable_load_extension(aTHX_ dbh, onoff );
     }
     OUTPUT:
         RETVAL
@@ -62,7 +62,7 @@ create_aggregate(dbh, name, argc, aggr)
         DBD::SQLite::db::sqlite_create_aggregate = 1
     CODE:
     {
-        RETVAL = sqlite3_db_create_aggregate(aTHX_ dbh, name, argc, aggr );
+        RETVAL = sqlite_db_create_aggregate(aTHX_ dbh, name, argc, aggr );
     }
     OUTPUT:
         RETVAL
@@ -76,7 +76,7 @@ create_collation(dbh, name, func)
         DBD::SQLite::db::sqlite_create_collation = 1
     CODE:
     {
-        RETVAL = sqlite3_db_create_collation(aTHX_ dbh, name, func );
+        RETVAL = sqlite_db_create_collation(aTHX_ dbh, name, func );
     }
     OUTPUT:
         RETVAL
@@ -90,7 +90,7 @@ collation_needed(dbh, callback)
         DBD::SQLite::db::sqlite_collation_needed = 1
     CODE:
     {
-        sqlite3_db_collation_needed(aTHX_ dbh, callback );
+        sqlite_db_collation_needed(aTHX_ dbh, callback );
     }
 
 
@@ -103,7 +103,7 @@ progress_handler(dbh, n_opcodes, handler)
         DBD::SQLite::db::sqlite_progress_handler = 1
     CODE:
     {
-        RETVAL = sqlite3_db_progress_handler(aTHX_ dbh, n_opcodes, handler );
+        RETVAL = sqlite_db_progress_handler(aTHX_ dbh, n_opcodes, handler );
     }
     OUTPUT:
         RETVAL
@@ -116,7 +116,7 @@ commit_hook(dbh, hook)
         DBD::SQLite::db::sqlite_commit_hook = 1
     CODE:
     {
-        RETVAL = (SV*) sqlite3_db_commit_hook( aTHX_ dbh, hook );
+        RETVAL = (SV*) sqlite_db_commit_hook( aTHX_ dbh, hook );
     }
     OUTPUT:
         RETVAL
@@ -129,7 +129,7 @@ rollback_hook(dbh, hook)
         DBD::SQLite::db::sqlite_rollback_hook = 1
     CODE:
     {
-        RETVAL = (SV*) sqlite3_db_rollback_hook( aTHX_ dbh, hook );
+        RETVAL = (SV*) sqlite_db_rollback_hook( aTHX_ dbh, hook );
     }
     OUTPUT:
         RETVAL
@@ -142,7 +142,7 @@ update_hook(dbh, hook)
         DBD::SQLite::db::sqlite_update_hook = 1
     CODE:
     {
-        RETVAL = (SV*) sqlite3_db_update_hook( aTHX_ dbh, hook );
+        RETVAL = (SV*) sqlite_db_update_hook( aTHX_ dbh, hook );
     }
     OUTPUT:
         RETVAL
@@ -156,7 +156,7 @@ set_authorizer(dbh, authorizer)
         DBD::SQLite::db::sqlite_set_authorizer = 1
     CODE:
     {
-        RETVAL = (SV*) sqlite3_db_set_authorizer( aTHX_ dbh, authorizer );
+        RETVAL = (SV*) sqlite_db_set_authorizer( aTHX_ dbh, authorizer );
     }
     OUTPUT:
         RETVAL
@@ -169,7 +169,7 @@ busy_timeout(dbh, timeout=0)
     ALIAS:
         DBD::SQLite::db::sqlite_busy_timeout = 1
     CODE:
-        RETVAL = sqlite3_db_busy_timeout(aTHX_ dbh, timeout );
+        RETVAL = sqlite_db_busy_timeout(aTHX_ dbh, timeout );
     OUTPUT:
         RETVAL
 
diff --git a/dbdimp.c b/dbdimp.c
index 9548bfc..6826b0b 100644
--- a/dbdimp.c
+++ b/dbdimp.c
@@ -129,7 +129,7 @@ sqlite_db_login(SV *dbh, imp_dbh_t *imp_dbh, char *dbname, char *user, char *pas
 }
 
 int
-sqlite3_db_busy_timeout (pTHX_ SV *dbh, int timeout )
+sqlite_db_busy_timeout (pTHX_ SV *dbh, int timeout )
 {
   D_imp_dbh(dbh);
   if (timeout) {
@@ -939,7 +939,7 @@ sqlite_db_func_dispatcher_no_unicode(sqlite3_context *context, int argc, sqlite3
 }
 
 int
-sqlite3_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func )
+sqlite_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func )
 {
     D_imp_dbh(dbh);
     int retval;
@@ -964,7 +964,7 @@ sqlite3_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func )
 }
 
 int
-sqlite3_db_enable_load_extension(pTHX_ SV *dbh, int onoff )
+sqlite_db_enable_load_extension(pTHX_ SV *dbh, int onoff )
 {
     D_imp_dbh(dbh);
     int retval;
@@ -1168,7 +1168,7 @@ sqlite_db_aggr_finalize_dispatcher( sqlite3_context *context )
 }
 
 int
-sqlite3_db_create_aggregate(pTHX_ SV *dbh, const char *name, int argc, SV *aggr_pkg )
+sqlite_db_create_aggregate(pTHX_ SV *dbh, const char *name, int argc, SV *aggr_pkg )
 {
     D_imp_dbh(dbh);
     int retval;
@@ -1262,7 +1262,7 @@ sqlite_db_collation_dispatcher_utf8(
 }
 
 int
-sqlite3_db_create_collation(pTHX_ SV *dbh, const char *name, SV *func )
+sqlite_db_create_collation(pTHX_ SV *dbh, const char *name, SV *func )
 {
     D_imp_dbh(dbh);
     int rv, rv2;
@@ -1304,7 +1304,7 @@ sqlite3_db_create_collation(pTHX_ SV *dbh, const char *name, SV *func )
 
 
 void
-sqlite3_db_collation_needed_dispatcher (
+sqlite_db_collation_needed_dispatcher (
     void *info,
     sqlite3* db, /* unused, because we need the Perl dbh */
     int eTextRep,
@@ -1333,7 +1333,7 @@ sqlite3_db_collation_needed_dispatcher (
 
 
 void
-sqlite3_db_collation_needed(pTHX_ SV *dbh, SV *callback )
+sqlite_db_collation_needed(pTHX_ SV *dbh, SV *callback )
 {
     D_imp_dbh(dbh);
 
@@ -1352,7 +1352,7 @@ sqlite3_db_collation_needed(pTHX_ SV *dbh, SV *callback )
     /* Register the func within sqlite3 */
     (void) sqlite3_collation_needed( imp_dbh->db, 
                                      (void*) info,
-                                     sqlite3_db_collation_needed_dispatcher );
+                                     sqlite_db_collation_needed_dispatcher );
 
 }
 
@@ -1384,7 +1384,7 @@ sqlite_db_generic_callback_dispatcher( void *callback )
 }
 
 int
-sqlite3_db_progress_handler(pTHX_ SV *dbh, int n_opcodes, SV *handler )
+sqlite_db_progress_handler(pTHX_ SV *dbh, int n_opcodes, SV *handler )
 {
     D_imp_dbh(dbh);
 
@@ -1408,7 +1408,7 @@ sqlite3_db_progress_handler(pTHX_ SV *dbh, int n_opcodes, SV *handler )
 
 
 SV*
-sqlite3_db_commit_hook( pTHX_ SV *dbh, SV *hook )
+sqlite_db_commit_hook( pTHX_ SV *dbh, SV *hook )
 {
     D_imp_dbh(dbh);
     void *retval;
@@ -1434,7 +1434,7 @@ sqlite3_db_commit_hook( pTHX_ SV *dbh, SV *hook )
 
 
 SV*
-sqlite3_db_rollback_hook( pTHX_ SV *dbh, SV *hook )
+sqlite_db_rollback_hook( pTHX_ SV *dbh, SV *hook )
 {
     D_imp_dbh(dbh);
     void *retval;
@@ -1489,7 +1489,7 @@ sqlite_db_update_dispatcher( void *callback, int op,
 
 
 SV*
-sqlite3_db_update_hook( pTHX_ SV *dbh, SV *hook )
+sqlite_db_update_hook( pTHX_ SV *dbh, SV *hook )
 {
     D_imp_dbh(dbh);
     void *retval;
@@ -1561,7 +1561,7 @@ sqlite_db_authorizer_dispatcher (
 
 
 int
-sqlite3_db_set_authorizer( pTHX_ SV *dbh, SV *authorizer )
+sqlite_db_set_authorizer( pTHX_ SV *dbh, SV *authorizer )
 {
     D_imp_dbh(dbh);
     int retval;
diff --git a/dbdimp.h b/dbdimp.h
index 52b540a..6ed477f 100644
--- a/dbdimp.h
+++ b/dbdimp.h
@@ -84,14 +84,14 @@ struct collationNeededInfo {
   SV *callback;
 };
 
-int sqlite3_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func);
-int sqlite3_db_enable_load_extension(pTHX_ SV *dbh, int onoff);
-int sqlite3_db_create_aggregate(pTHX_ SV *dbh, const char *name, int argc, SV *aggr );
-int sqlite3_db_create_collation(pTHX_ SV *dbh, const char *name, SV *func);
-int sqlite3_db_progress_handler(pTHX_ SV *dbh, int n_opcodes, SV *handler);
+int sqlite_db_create_function(pTHX_ SV *dbh, const char *name, int argc, SV *func);
+int sqlite_db_enable_load_extension(pTHX_ SV *dbh, int onoff);
+int sqlite_db_create_aggregate(pTHX_ SV *dbh, const char *name, int argc, SV *aggr );
+int sqlite_db_create_collation(pTHX_ SV *dbh, const char *name, SV *func);
+int sqlite_db_progress_handler(pTHX_ SV *dbh, int n_opcodes, SV *handler);
 void sqlite_st_reset(pTHX_ SV *sth );
 int sqlite_bind_col( SV *sth, imp_sth_t *imp_sth, SV *col, SV *ref, IV sql_type, SV *attribs );
-int sqlite3_db_busy_timeout (pTHX_ SV *dbh, int timeout );
+int sqlite_db_busy_timeout (pTHX_ SV *dbh, int timeout );
 int sqlite_db_backup_from_file(pTHX_ SV *dbh, char *filename);
 int sqlite_db_backup_to_file(pTHX_ SV *dbh, char *filename);