diff --git a/lib/webrat/core/session.rb b/lib/webrat/core/session.rb
index 49868b3..4da90c7 100644
--- a/lib/webrat/core/session.rb
+++ b/lib/webrat/core/session.rb
@@ -26,7 +26,7 @@ module Webrat
       RackAdapter
     when :sinatra
       warn("The :sinatra mode is deprecated. Please use :rack instead")
-      SinatraSession
+      SinatraAdapter
     when :selenium
       SeleniumSession
     when :mechanize
diff --git a/lib/webrat/sinatra.rb b/lib/webrat/sinatra.rb
index eeb28b6..1ca82de 100644
--- a/lib/webrat/sinatra.rb
+++ b/lib/webrat/sinatra.rb
@@ -1,7 +1,7 @@
 require "webrat/rack"
 
 module Webrat
-  class SinatraSession < RackAdapter
+  class SinatraAdapter < RackAdapter
     def initialize(context)
       app = context.respond_to?(:app) ? context.app : Sinatra::Application