diff --git a/lib/net/ldap.rb b/lib/net/ldap.rb
index b81a9d8..35b3ddf 100644
--- a/lib/net/ldap.rb
+++ b/lib/net/ldap.rb
@@ -553,7 +553,7 @@ class Net::LDAP
     # anything with the bind results. We then pass self to the caller's
     # block, where he will execute his LDAP operations. Of course they will
     # all generate auth failures if the bind was unsuccessful.
-    raise LdapError, "Open already in progress" if @open_connection
+    raise Net::LDAP::LdapError, "Open already in progress" if @open_connection
 
     begin
       @open_connection = Net::LDAP::Connection.new(:host => @host,
@@ -1034,7 +1034,7 @@ class Net::LDAP
   #  dn = "mail=deleteme@example.com, ou=people, dc=example, dc=com"
   #  ldap.delete_tree :dn => dn
   def delete_tree(args)
-    delete(args.merge(:control_codes => [[LDAPControls::DELETE_TREE, true]]))
+    delete(args.merge(:control_codes => [[Net::LDAP::LDAPControls::DELETE_TREE, true]]))
   end
   # This method is experimental and subject to change. Return the rootDSE
   # record from the LDAP server as a Net::LDAP::Entry, or an empty Entry if
@@ -1106,7 +1106,7 @@ class Net::LDAP
   #++
   def paged_searches_supported?
     @server_caps ||= search_root_dse
-    @server_caps[:supportedcontrol].include?(LDAPControls::PAGED_RESULTS)
+    @server_caps[:supportedcontrol].include?(Net::LDAP::LDAPControls::PAGED_RESULTS)
   end
 end # class LDAP
 
@@ -1403,7 +1403,7 @@ class Net::LDAP::Connection #:nodoc:
       controls = []
       controls <<
         [
-          LDAPControls::PAGED_RESULTS.to_ber,
+          Net::LDAP::LDAPControls::PAGED_RESULTS.to_ber,
           # Criticality MUST be false to interoperate with normal LDAPs.
           false.to_ber,
           rfc2696_cookie.map{ |v| v.to_ber}.to_ber_sequence.to_s.to_ber
@@ -1451,7 +1451,7 @@ class Net::LDAP::Connection #:nodoc:
       more_pages = false
       if result_code == 0 and controls
         controls.each do |c|
-          if c.oid == LDAPControls::PAGED_RESULTS
+          if c.oid == Net::LDAP::LDAPControls::PAGED_RESULTS
             # just in case some bogus server sends us more than 1 of these.
             more_pages = false
             if c.value and c.value.length > 0