diff --git a/lib/dm-do-adapter/adapter.rb b/lib/dm-do-adapter/adapter.rb
index e5cd8c3..418a9a4 100644
--- a/lib/dm-do-adapter/adapter.rb
+++ b/lib/dm-do-adapter/adapter.rb
@@ -229,7 +229,7 @@ def normalized_uri
             port = @options[:port].nil? ? nil : @options[:port].to_int
 
             DataObjects::URI.new(
-              :scheme     => @options[:adapter],
+              :scheme     => @options[:scheme] || @options[:adapter],
               :user       => @options[:user] || @options[:username],
               :password   => @options[:password],
               :host       => @options[:host],
@@ -266,7 +266,7 @@ def initialize(name, uri_or_options)
         super
 
         # Default the driver-specific logger to DataMapper's logger
-        if driver_module = DataObjects.const_get(normalized_uri.scheme.capitalize)
+        if driver_module = DataObjects.adapter_name(normalized_uri)
           driver_module.logger = DataMapper.logger if driver_module.respond_to?(:logger=)
         end
       end