diff --git a/docs/manual/src/docbook/appendix-namespace.xml b/docs/manual/src/docbook/appendix-namespace.xml
index 3433a525c7..938cb7c5b9 100644
--- a/docs/manual/src/docbook/appendix-namespace.xml
+++ b/docs/manual/src/docbook/appendix-namespace.xml
@@ -126,7 +126,7 @@
       <title>The <literal>&lt;intercept-url&gt;</literal> Element</title>
       <para> This element is used to define the set of URL patterns that the application is
         interested in and to configure how they should be handled. It is used to construct the
-          <interfacename>FilterInvocationDefinitionSource</interfacename> used by the
+          <interfacename>FilterInvocationSecurityMetadataSource</interfacename> used by the
           <classname>FilterSecurityInterceptor</classname> and to exclude particular patterns from
         the filter chain entirely (by setting the attribute <literal>filters="none"</literal>). It
         is also responsible for configuring a <classname>ChannelAuthenticationFilter</classname> if
@@ -149,7 +149,7 @@
       <section xml:id="nsa-access">
         <title><literal>access</literal></title>
         <para> Lists the access attributes which will be stored in the
-            <interfacename>FilterInvocationDefinitionSource</interfacename> for the defined URL
+            <interfacename>FilterInvocationSecurityMetadataSource</interfacename> for the defined URL
           pattern/method combination. This should be a comma-separated list of the security
           configuration attributes (such as role names). </para>
       </section>
diff --git a/docs/manual/src/docbook/core-filters.xml b/docs/manual/src/docbook/core-filters.xml
index 387562cb97..0b3b0c57ef 100644
--- a/docs/manual/src/docbook/core-filters.xml
+++ b/docs/manual/src/docbook/core-filters.xml
@@ -54,7 +54,7 @@
             interface which subclasses <interfacename>SecurityMetadataSource</interfacename>. It
             simply denotes the <interfacename>SecurityMetadataSource</interfacename> understands
                 <classname>FilterInvocation</classname>s. In the interests of simplicity we'll
-            continue to refer to the <interfacename>FilterInvocationDefinitionSource</interfacename>
+            continue to refer to the <interfacename>FilterInvocationSecurityMetadataSource</interfacename>
             as a <interfacename>SecurityMetadataSource</interfacename>, as the distinction is of
             little relevance to most users.</para>
         <para>The <interfacename>SecurityMetadataSource</interfacename> created by the namespace