diff --git a/doc/guide/admin/aspell.en.pws b/doc/guide/admin/aspell.en.pws
index 69939d9070..de69b610a9 100644
--- a/doc/guide/admin/aspell.en.pws
+++ b/doc/guide/admin/aspell.en.pws
@@ -1383,7 +1383,7 @@ SSHA
 mandir
 RXER
 SSFs
-octetStringOrderingStringMatch
+octetStringOrderingMatch
 auditCompare
 pEntry
 strongAuthNotSupported
@@ -1657,7 +1657,7 @@ BCP
 baz
 params
 generalizedTimeOrderingMatch
-octetStringSubstringsStringMatch
+octetStringSubstringsMatch
 ber
 slimit
 ali
diff --git a/doc/guide/admin/schema.sdf b/doc/guide/admin/schema.sdf
index e1d45b36bc..c5a0140c7d 100644
--- a/doc/guide/admin/schema.sdf
+++ b/doc/guide/admin/schema.sdf
@@ -260,8 +260,8 @@ numericStringMatch			equality	numerical
 numericStringOrderingMatch		ordering	numerical
 numericStringSubstringsMatch		substrings	numerical
 octetStringMatch			equality	octet string
-octetStringOrderingStringMatch		ordering	octet string
-octetStringSubstringsStringMatch	ordering	octet string
+octetStringOrderingMatch		ordering	octet string
+octetStringSubstringsMatch	ordering	octet string
 objectIdentiferMatch			equality	object identifier
 !endblock