diff --git a/lib/faraday_middleware.rb b/lib/faraday_middleware.rb
index 49261a59..391940b0 100644
--- a/lib/faraday_middleware.rb
+++ b/lib/faraday_middleware.rb
@@ -19,14 +19,14 @@ module FaradayMiddleware
   autoload :Instrumentation, 'faraday_middleware/instrumentation'
   autoload :Gzip, 'faraday_middleware/gzip'
 
-  if Faraday.respond_to? :register_middleware
-    Faraday.register_middleware :request,
+  if Faraday::Middleware.respond_to? :register_middleware
+    Faraday::Request.register_middleware \
       :oauth    => lambda { OAuth },
       :oauth2   => lambda { OAuth2 },
       :json     => lambda { EncodeJson },
       :method_override => lambda { MethodOverride }
 
-    Faraday.register_middleware :response,
+    Faraday::Response.register_middleware \
       :mashify  => lambda { Mashify },
       :rashify  => lambda { Rashify },
       :json     => lambda { ParseJson },
@@ -39,7 +39,7 @@ module FaradayMiddleware
       :follow_redirects => lambda { FollowRedirects },
       :chunked => lambda { Chunked }
 
-    Faraday.register_middleware \
+    Faraday::Middleware.register_middleware \
       :instrumentation  => lambda { Instrumentation },
       :gzip => lambda { Gzip }
   end