diff --git a/servers/lloadd/bind.c b/servers/lloadd/bind.c
index 37a391dd37..36df6db215 100644
--- a/servers/lloadd/bind.c
+++ b/servers/lloadd/bind.c
@@ -29,7 +29,7 @@
  * upstream's c_io_mutex.
  */
 static int
-request_bind( Operation *op )
+client_bind( Operation *op )
 {
     Connection *client = op->o_client, *upstream = op->o_upstream;
     BerElement *ber, *copy = NULL;
@@ -130,7 +130,7 @@ fail:
  * upstream's c_io_mutex.
  */
 static int
-request_bind_as_vc( Operation *op )
+client_bind_as_vc( Operation *op )
 {
     Connection *client = op->o_client, *upstream = op->o_upstream;
     BerElement *ber, *request, *copy = NULL;
@@ -302,7 +302,7 @@ client_reset( Connection *c )
 }
 
 int
-client_bind( Connection *client, Operation *op )
+request_bind( Connection *client, Operation *op )
 {
     Connection *upstream;
     int rc = LDAP_SUCCESS;
@@ -338,11 +338,11 @@ client_bind( Connection *client, Operation *op )
 
 #ifdef LDAP_API_FEATURE_VERIFY_CREDENTIALS
     if ( lload_features & LLOAD_FEATURE_VC ) {
-        rc = request_bind_as_vc( op );
+        rc = client_bind_as_vc( op );
     } else
 #endif /* LDAP_API_FEATURE_VERIFY_CREDENTIALS */
     {
-        rc = request_bind( op );
+        rc = client_bind( op );
     }
 
     CONNECTION_LOCK_DECREF(upstream);
diff --git a/servers/lloadd/client.c b/servers/lloadd/client.c
index c9aab64a46..9d8cb9dd7f 100644
--- a/servers/lloadd/client.c
+++ b/servers/lloadd/client.c
@@ -58,7 +58,7 @@ handle_one_request( Connection *c )
             CONNECTION_DESTROY(c);
             return -1;
         case LDAP_REQ_BIND:
-            handler = client_bind;
+            handler = request_bind;
             break;
         case LDAP_REQ_ABANDON:
             /* FIXME: We need to be able to abandon a Bind request, handling
diff --git a/servers/lloadd/proto-slap.h b/servers/lloadd/proto-slap.h
index fc2cb30db7..ae2267dbe0 100644
--- a/servers/lloadd/proto-slap.h
+++ b/servers/lloadd/proto-slap.h
@@ -65,7 +65,7 @@ LDAP_SLAPD_F (void) ch_free( void * );
  * bind.c
  */
 LDAP_SLAPD_F (void) client_reset( Connection *c );
-LDAP_SLAPD_F (int) client_bind( Connection *c, Operation *op );
+LDAP_SLAPD_F (int) request_bind( Connection *c, Operation *op );
 
 /*
  * client.c