-typedef struct slap_backend_db Slapi_Backend;
-typedef struct slap_op Slapi_Operation;
-typedef struct slap_conn Slapi_Connection;
+typedef struct BackendDB Slapi_Backend;
+typedef struct Operation Slapi_Operation;
+typedef struct Connection Slapi_Connection;