diff --git a/src/sqlite3/connection.cr b/src/sqlite3/connection.cr
index 6659e15..0b8d061 100644
--- a/src/sqlite3/connection.cr
+++ b/src/sqlite3/connection.cr
@@ -14,7 +14,7 @@ class SQLite3::Connection < DB::Connection
   end
 
   def build_statement(query)
-    Statement2.new(self, query)
+    Statement.new(self, query)
   end
 
   def do_close
diff --git a/src/sqlite3/result_set2.cr b/src/sqlite3/result_set.cr
similarity index 98%
rename from src/sqlite3/result_set2.cr
rename to src/sqlite3/result_set.cr
index 283c70b..53001a5 100644
--- a/src/sqlite3/result_set2.cr
+++ b/src/sqlite3/result_set.cr
@@ -1,4 +1,4 @@
-class SQLite3::ResultSet2 < DB::ResultSet
+class SQLite3::ResultSet < DB::ResultSet
   @column_index = 0
 
   protected def do_close
diff --git a/src/sqlite3/statement2.cr b/src/sqlite3/statement.cr
similarity index 95%
rename from src/sqlite3/statement2.cr
rename to src/sqlite3/statement.cr
index d937868..d0cde14 100644
--- a/src/sqlite3/statement2.cr
+++ b/src/sqlite3/statement.cr
@@ -1,4 +1,4 @@
-class SQLite3::Statement2 < DB::Statement
+class SQLite3::Statement < DB::Statement
   def initialize(connection, sql)
     super(connection)
     check LibSQLite3.prepare_v2(@connection, sql, sql.bytesize + 1, out @stmt, nil)
@@ -9,7 +9,7 @@ class SQLite3::Statement2 < DB::Statement
     args.each_with_index(1) do |arg, index|
       bind_arg(index, arg)
     end
-    ResultSet2.new(self)
+    ResultSet.new(self)
   end
 
   protected def perform_exec(args : Slice(DB::Any))