diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index e828e2fc83..e9cfa1fe3b 100644
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -405,7 +405,7 @@ get_substring_filter(
 	}
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-	f->f_sub = ch_calloc( 1, sizeof(SubstringAssertion) );
+	f->f_sub = ch_calloc( 1, sizeof(SubstringsAssertion) );
 	f->f_sub_desc = NULL;
 	rc = slap_bv2ad( &type, &f->f_sub_desc, text );
 
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index ce23fb2942..a88d38448a 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -398,7 +398,7 @@ typedef struct slap_ss_assertion {
 	struct berval			*sa_initial;
 	struct berval			**sa_any;
 	struct berval			*sa_final;
-} SubstringAssertion;
+} SubstringsAssertion;
 
 typedef struct slap_mr_assertion {
 	char					*ma_rule;	/* optional */
@@ -455,7 +455,7 @@ typedef struct slap_filter {
 		AttributeAssertion *f_un_ava;
 
 		/* substring assertion */
-		SubstringAssertion *f_un_ssa;
+		SubstringsAssertion *f_un_ssa;
 
 		/* matching rule assertion */
 		MatchingRuleAssertion *f_un_mra;