diff --git a/lib/webrat/core/methods.rb b/lib/webrat/core/methods.rb
index 3c4df23..b6fc0aa 100644
--- a/lib/webrat/core/methods.rb
+++ b/lib/webrat/core/methods.rb
@@ -20,7 +20,7 @@ module Webrat
     end
 
     def webrat_adapter
-      @_webrat_adapter ||= Webrat.session_class.new(self)
+      @_webrat_adapter ||= Webrat.adapter_class.new(self)
     end
 
     # all of these methods delegate to the @session, which should
diff --git a/lib/webrat/core/session.rb b/lib/webrat/core/session.rb
index 4da90c7..bace5b5 100644
--- a/lib/webrat/core/session.rb
+++ b/lib/webrat/core/session.rb
@@ -12,7 +12,7 @@ module Webrat
   class InfiniteRedirectError < WebratError
   end
 
-  def self.session_class
+  def self.adapter_class
     case Webrat.configuration.mode
     when :rails
       RailsSession
diff --git a/spec/fakes/test_session.rb b/spec/fakes/test_session.rb
index 8679410..b31f055 100644
--- a/spec/fakes/test_session.rb
+++ b/spec/fakes/test_session.rb
@@ -1,5 +1,5 @@
 module Webrat #:nodoc:
-  def self.session_class #:nodoc:
+  def self.adapter_class #:nodoc:
     TestSession
   end