diff --git a/jruby/neo4j/driver/ext/graph_database.rb b/jruby/neo4j/driver/ext/graph_database.rb
index ca7b81b6..4a4c74ed 100644
--- a/jruby/neo4j/driver/ext/graph_database.rb
+++ b/jruby/neo4j/driver/ext/graph_database.rb
@@ -4,11 +4,11 @@ module Neo4j
   module Driver
     module Ext
       module GraphDatabase
-        extend AutoClosable
+        extend AutoCloseable
         include ConfigConverter
         include ExceptionCheckable
 
-        auto_closable :driver
+        auto_closeable :driver
 
         def driver(uri, auth_token = Neo4j::Driver::AuthTokens.none, **config)
           check do
diff --git a/jruby/neo4j/driver/ext/internal_driver.rb b/jruby/neo4j/driver/ext/internal_driver.rb
index eadcfdf7..4e11d085 100644
--- a/jruby/neo4j/driver/ext/internal_driver.rb
+++ b/jruby/neo4j/driver/ext/internal_driver.rb
@@ -4,12 +4,12 @@ module Neo4j
   module Driver
     module Ext
       module InternalDriver
-        extend AutoClosable
+        extend AutoCloseable
         include ConfigConverter
         include ExceptionCheckable
         include AsyncConverter
 
-        auto_closable :session
+        auto_closeable :session
 
         def session(**session_config)
           java_method(:session, [org.neo4j.driver.SessionConfig])
diff --git a/jruby/neo4j/driver/ext/internal_session.rb b/jruby/neo4j/driver/ext/internal_session.rb
index 73fd67c8..45d13fdf 100644
--- a/jruby/neo4j/driver/ext/internal_session.rb
+++ b/jruby/neo4j/driver/ext/internal_session.rb
@@ -4,12 +4,12 @@ module Neo4j
   module Driver
     module Ext
       module InternalSession
-        extend AutoClosable
+        extend AutoCloseable
         include ConfigConverter
         include ExceptionCheckable
         include RunOverride
 
-        auto_closable :begin_transaction
+        auto_closeable :begin_transaction
 
         # work around jruby issue https://github.com/jruby/jruby/issues/5603
         Struct.new('Wrapper', :object)
diff --git a/lib/neo4j/driver/auto_closable.rb b/lib/neo4j/driver/auto_closeable.rb
similarity index 64%
rename from lib/neo4j/driver/auto_closable.rb
rename to lib/neo4j/driver/auto_closeable.rb
index a03abcc0..9e7b0d41 100644
--- a/lib/neo4j/driver/auto_closable.rb
+++ b/lib/neo4j/driver/auto_closeable.rb
@@ -2,8 +2,8 @@
 
 module Neo4j
   module Driver
-    module AutoClosable
-      def auto_closable(*methods)
+    module AutoCloseable
+      def auto_closeable(*methods)
         prepend with_block_definer(methods)
       end
 
@@ -13,15 +13,15 @@ def with_block_definer(methods)
         Module.new do
           methods.each do |method|
             define_method(method) do |*args, **kwargs, &block|
-              closable = super(*args, **kwargs)
+              closeable = super(*args, **kwargs)
               if block
                 begin
-                  block.arity.zero? ? closable.instance_eval(&block) : block.call(closable)
+                  block.arity.zero? ? closeable.instance_eval(&block) : block.call(closeable)
                 ensure
-                  closable&.close
+                  closeable&.close
                 end
               else
-                closable
+                closeable
               end
             end
           end
diff --git a/ruby/neo4j/driver/graph_database.rb b/ruby/neo4j/driver/graph_database.rb
index 858fd561..d8ed8c7a 100644
--- a/ruby/neo4j/driver/graph_database.rb
+++ b/ruby/neo4j/driver/graph_database.rb
@@ -3,8 +3,8 @@
 module Neo4j::Driver
   class GraphDatabase
     class << self
-      extend AutoClosable
-      auto_closable :driver, :routing_driver
+      extend AutoCloseable
+      auto_closeable :driver, :routing_driver
 
       def driver(uri, auth_token = nil, **config)
         internal_driver(uri, auth_token, config)
diff --git a/ruby/neo4j/driver/internal/internal_driver.rb b/ruby/neo4j/driver/internal/internal_driver.rb
index 6a211388..b16df097 100644
--- a/ruby/neo4j/driver/internal/internal_driver.rb
+++ b/ruby/neo4j/driver/internal/internal_driver.rb
@@ -1,12 +1,12 @@
 module Neo4j::Driver
   module Internal
     class InternalDriver
-      extend AutoClosable
+      extend AutoCloseable
       extend Synchronizable
       attr_reader :session_factory, :metrics_provider
       # delegate :verify_connectivity, to: :session_factory
       delegate :metrics, :metrics_enabled?, to: :metrics_provider
-      auto_closable :session
+      auto_closeable :session
       sync :close, :supports_multi_db?, :verify_connectivity, :session
 
       def initialize(security_plan, session_factory, metrics_provider, logger)
diff --git a/ruby/neo4j/driver/internal/internal_session.rb b/ruby/neo4j/driver/internal/internal_session.rb
index 0604ca32..b9894b23 100644
--- a/ruby/neo4j/driver/internal/internal_session.rb
+++ b/ruby/neo4j/driver/internal/internal_session.rb
@@ -1,11 +1,11 @@
 module Neo4j::Driver
   module Internal
     class InternalSession
-      extend AutoClosable
+      extend AutoCloseable
       extend Synchronizable
       # include Ext::RunOverride
       delegate :open?, :last_bookmark, to: :@session
-      auto_closable :begin_transaction
+      auto_closeable :begin_transaction
       sync :close, :begin_transaction, :run, :transaction
 
       def initialize(session)