Refactor the LDAP classes to have consistent naming