diff --git a/docs/manual/src/docbook/appendix-namespace.xml b/docs/manual/src/docbook/appendix-namespace.xml
index 938cb7c5b9..8584b8ad66 100644
--- a/docs/manual/src/docbook/appendix-namespace.xml
+++ b/docs/manual/src/docbook/appendix-namespace.xml
@@ -456,15 +456,14 @@
         element somewhere. It is responsible for registering the
           <interfacename>AuthenticationManager</interfacename> which provides authentication
         services to the application. It also allows you to define an alias name for the internal
-        instance for use in your own configuration. Its use is described in the <link
-          xlink:href="#ns-auth-manager">namespace introduction</link>. All elements which create
+        instance for use in your own configuration. Its use is described in the 
+          <link xlink:href="#ns-auth-manager">namespace introduction</link>. All elements which create
           <interfacename>AuthenticationProvider</interfacename> instances should be children of this
         element.</para>
       <section>
         <title>The <literal>&lt;authentication-provider&gt;</literal> Element</title>
-        <para> This element is basically a shorthand syntax for configuring a <link
-            xlink:href="#core-services-dao-provider"
-              ><classname>DaoAuthenticationProvider</classname></link>.
+        <para> Unless used with a <literal>ref</literal> attribute, this element is shorthand for configuring a
+            <link xlink:href="#core-services-dao-provider"><classname>DaoAuthenticationProvider</classname></link>.
             <classname>DaoAuthenticationProvider</classname> loads user information from a
             <interfacename>UserDetailsService</interfacename> and compares the username/password
           combination with the values supplied at login. The
diff --git a/docs/manual/src/docbook/channel-security.xml b/docs/manual/src/docbook/channel-security.xml
index 02f5756aff..7adeac9e55 100644
--- a/docs/manual/src/docbook/channel-security.xml
+++ b/docs/manual/src/docbook/channel-security.xml
@@ -56,7 +56,7 @@
 </bean>
 
 <bean id="channelDecisionManager"
-    class="org.springframework.security.access.channel.ChannelDecisionManagerImpl">
+    class="org.springframework.security.web.access.channel.ChannelDecisionManagerImpl">
   <property name="channelProcessors">
     <list>
     <ref bean="secureChannelProcessor"/>
@@ -66,9 +66,9 @@
 </bean>
 
 <bean id="secureChannelProcessor"
-  class="org.springframework.security.access.channel.SecureChannelProcessor"/>
+  class="org.springframework.security.web.access.channel.SecureChannelProcessor"/>
 <bean id="insecureChannelProcessor"
-  class="org.springframework.security.access.channel.InsecureChannelProcessor"/>]]>
+  class="org.springframework.security.web.access.channel.InsecureChannelProcessor"/>]]>
 </programlisting>
             Like <classname>FilterSecurityInterceptor</classname>, Apache Ant style paths are also
             supported by the <literal>ChannelProcessingFilter</literal>.</para>
diff --git a/docs/manual/src/docbook/core-filters.xml b/docs/manual/src/docbook/core-filters.xml
index 0b3b0c57ef..2047d9be24 100644
--- a/docs/manual/src/docbook/core-filters.xml
+++ b/docs/manual/src/docbook/core-filters.xml
@@ -16,7 +16,7 @@
                 <classname>ExceptionTranslationFilter</classname>. A typical configuration example
             is shown below: <programlisting language="xml"><![CDATA[
 <bean id="filterSecurityInterceptor"
-        class="org.springframework.security.intercept.web.FilterSecurityInterceptor">
+        class="org.springframework.security.web.access.intercept.FilterSecurityInterceptor">
   <property name="authenticationManager" ref="authenticationManager"/>
   <property name="accessDecisionManager" ref="accessDecisionManager"/>
   <property name="securityMetadataSource">
@@ -54,8 +54,9 @@
             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>FilterInvocationSecurityMetadataSource</interfacename>
-            as a <interfacename>SecurityMetadataSource</interfacename>, as the distinction is of
+            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
             syntax obtains the configuration attributes for a particular
@@ -69,7 +70,7 @@
             be written as follows:</para>
         <programlisting language="xml"><![CDATA[
 <bean id="filterInvocationInterceptor"
-     class="org.springframework.security.intercept.web.FilterSecurityInterceptor">
+     class="org.springframework.security.web.access.intercept.FilterSecurityInterceptor">
   <property name="authenticationManager" ref="authenticationManager"/>
   <property name="accessDecisionManager" ref="accessDecisionManager"/>
   <property name="runAsManager" ref="runAsManager"/>
@@ -246,8 +247,9 @@ class="org.springframework.security.web.context.SecurityContextPersistenceFilter
                     was called <classname>AuthenticationProcessingFilterEntryPoint</classname>.
                     Since the framework now supports many different forms of authentication, they
                     have both been given more specific names in 3.0.</para>
-            </footnote>. It also provides the implementation used by the <literal>&lt;form-login&gt;</literal> element
-            from the namespace. There are three stages required to configure it. <orderedlist>
+            </footnote>. It also provides the implementation used by the
+                <literal>&lt;form-login&gt;</literal> element from the namespace. There are three
+            stages required to configure it. <orderedlist>
                 <listitem>
                     <para>Configure a <classname>LoginUrlAuthenticationEntryPoint</classname> with
                         the URL of the login page, just as we did above, and set it on the
@@ -298,8 +300,8 @@ class="org.springframework.security.web.context.SecurityContextPersistenceFilter
             <para>If authentication is successful, the resulting
                     <interfacename>Authentication</interfacename> object will be placed into the
                     <classname>SecurityContextHolder</classname>. The configured
-                <interfacename>AuthenticationSuccessHandler</interfacename> will then be called to either redirect or forward the
-                user to the appropriate destination. By default a
+                    <interfacename>AuthenticationSuccessHandler</interfacename> will then be called
+                to either redirect or forward the user to the appropriate destination. By default a
                     <classname>SavedRequestAwareAuthenticationSuccessHandler</classname> is used,
                 which means that the user will be redirected to the original destination they
                 requested before they were asked to login. <note>
diff --git a/docs/manual/src/docbook/secured-objects.xml b/docs/manual/src/docbook/secured-objects.xml
index dd2fe56183..eca66bc55f 100644
--- a/docs/manual/src/docbook/secured-objects.xml
+++ b/docs/manual/src/docbook/secured-objects.xml
@@ -86,8 +86,8 @@
     <programlisting language="java">
 package org.springframework.security.samples.aspectj;
 
-import org.springframework.security.intercept.aspectj.AspectJSecurityInterceptor;
-import org.springframework.security.intercept.aspectj.AspectJCallback;
+import org.springframework.security.access.intercept.aspectj.AspectJSecurityInterceptor;
+import org.springframework.security.access.intercept.aspectj.AspectJCallback;
 import org.springframework.beans.factory.InitializingBean;
 
 public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
@@ -138,7 +138,7 @@ public aspect DomainObjectInstanceSecurityAspect implements InitializingBean {
       shown below:</para>
     <programlisting><![CDATA[
 <bean id="domainObjectInstanceSecurityAspect"
-     class="org.springframework.security.samples.aspectj.DomainObjectInstanceSecurityAspect"
+     class="security.samples.aspectj.DomainObjectInstanceSecurityAspect"
      factory-method="aspectOf">
   <property name="securityInterceptor" ref="bankManagerSecurity"/>
 </bean>]]>
diff --git a/docs/manual/src/docbook/session-mgmt.xml b/docs/manual/src/docbook/session-mgmt.xml
index d73c3453e3..0344a5f8a4 100644
--- a/docs/manual/src/docbook/session-mgmt.xml
+++ b/docs/manual/src/docbook/session-mgmt.xml
@@ -44,13 +44,13 @@
   </http>
 
   <beans:bean id="myAuthFilter"
-      class="org.springframework.security.web.authentcation.UsernamePasswordAuthenticationFilter">
+      class="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter">
     <beans:property name="sessionAuthenticationStrategy" ref="sas" />
     ...
   </beans:bean>
 
   <beans:bean id="sas"
-      class="org.springframework.security.web.session.DefaultAuthenticatedSessionStrategy">
+      class="org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy">
     <beans:property name="sessionRegistry" ref="sessionRegistry" />
     <beans:property name="maximumSessions" value="1" />
   </beans:bean>