}
 
 static int
-slapi_op_response( Operation *op, SlapReply *rs )
+slapi_over_response( Operation *op, SlapReply *rs )
 {
        int                     rc;
 
 }
 
 static int
-slapi_op_cleanup( Operation *op, SlapReply *rs )
+slapi_over_cleanup( Operation *op, SlapReply *rs )
 {
        int                     rc;
 
 
        slapi_int_pblock_set_operation( pb, op );
 
-       cb.sc_response = slapi_op_response; /* call pre-entry/result plugins */
-       cb.sc_cleanup = slapi_op_cleanup;  /* call post-entry/result plugins */
+       cb.sc_response = slapi_over_response; /* call pre-entry/result plugins */
+       cb.sc_cleanup = slapi_over_cleanup;  /* call post-entry/result plugins */
        cb.sc_private = opinfo;
        cb.sc_next = op->o_callback;
        op->o_callback = &cb;