diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 24fcb2ca16..162695c929 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -127,7 +127,7 @@ rwm_add( Operation *op, SlapReply *rs )
 					(*ap)->a_vals );
 #else
 			rc = 1;
-			rc = rwm_op_dn_massage( op, rs, &rc,
+			rc = rwm_dnattr_rewrite( op, rs, &rc,
 					(*ap)->a_vals );
 #endif
 			if ( rc ) {
diff --git a/servers/slapd/overlays/rwmconf.c b/servers/slapd/overlays/rwmconf.c
index d664b4a952..d225483bfe 100644
--- a/servers/slapd/overlays/rwmconf.c
+++ b/servers/slapd/overlays/rwmconf.c
@@ -216,7 +216,7 @@ rwm_map_config(
 
 error_return:;
 	if ( mapping ) {
-		mapping_free( mapping );
+		rwm_mapping_free( mapping );
 	}
 
 	return 1;