diff --git a/spring-framework-reference/src/aop.xml b/spring-framework-reference/src/aop.xml
index a9e382cc762..dfdd2b880a8 100644
--- a/spring-framework-reference/src/aop.xml
+++ b/spring-framework-reference/src/aop.xml
@@ -2129,8 +2129,8 @@ public class SimpleProfiler {
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:aop="http://www.springframework.org/schema/aop"
       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
 
    <lineannotation>&lt;!-- this is the object that will be proxied by Spring's AOP infrastructure --&gt;</lineannotation>
    &lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
@@ -3272,9 +3272,9 @@ public class ProfilingAspect {
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="
 http://www.springframework.org/schema/beans 
-    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+    http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/context 
-    http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+    http://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     <lineannotation>&lt;!-- a service object; we will be profiling its methods --&gt;</lineannotation>
     &lt;bean id="entitlementCalculationService"
@@ -3495,9 +3495,9 @@ public final class Main {
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="
 http://www.springframework.org/schema/beans
-    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+    http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/context
-    http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+    http://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     &lt;context:load-time-weaver/&gt;
 
@@ -3602,9 +3602,9 @@ http://www.springframework.org/schema/context
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="
 http://www.springframework.org/schema/beans
-    http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+    http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.springframework.org/schema/context
-    http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+    http://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     &lt;context:load-time-weaver
             <emphasis role="bold">weaver-class="org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver"</emphasis>/&gt;
diff --git a/spring-framework-reference/src/beans-annotation-config.xml b/spring-framework-reference/src/beans-annotation-config.xml
index c8e5229725e..8c861ff5546 100644
--- a/spring-framework-reference/src/beans-annotation-config.xml
+++ b/spring-framework-reference/src/beans-annotation-config.xml
@@ -63,9 +63,9 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      <lineannotation>xmlns:context="http://www.springframework.org/schema/context"</lineannotation>
      xsi:schemaLocation="http://www.springframework.org/schema/beans
-         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+         http://www.springframework.org/schema/beans/spring-beans.xsd
          http://www.springframework.org/schema/context
-         http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+         http://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
    <lineannotation>&lt;context:annotation-config/&gt;</lineannotation>
 
@@ -357,9 +357,9 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+      http://www.springframework.org/schema/beans/spring-beans.xsd
       http://www.springframework.org/schema/context
-      http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+      http://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
   &lt;context:annotation-config/&gt;
 
@@ -474,9 +474,9 @@ public @interface Genre {
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+      http://www.springframework.org/schema/beans/spring-beans.xsd
       http://www.springframework.org/schema/context
-      http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+      http://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
   &lt;context:annotation-config/&gt;
 
@@ -597,9 +597,9 @@ public @interface MovieQualifier {
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+      http://www.springframework.org/schema/beans/spring-beans.xsd
       http://www.springframework.org/schema/context
-      http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+      http://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
   &lt;context:annotation-config/&gt;
 
diff --git a/spring-framework-reference/src/beans-classpath-scanning.xml b/spring-framework-reference/src/beans-classpath-scanning.xml
index ed5d472cb45..da1d4eafc03 100644
--- a/spring-framework-reference/src/beans-classpath-scanning.xml
+++ b/spring-framework-reference/src/beans-classpath-scanning.xml
@@ -108,9 +108,9 @@ public class JpaMovieFinder implements MovieFinder {
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:context="http://www.springframework.org/schema/context"
      xsi:schemaLocation="http://www.springframework.org/schema/beans
-         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+         http://www.springframework.org/schema/beans/spring-beans.xsd
          http://www.springframework.org/schema/context
-         http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+         http://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
    &lt;context:component-scan base-package="org.example"/&gt;
 
diff --git a/spring-framework-reference/src/beans-dependencies.xml b/spring-framework-reference/src/beans-dependencies.xml
index bbf4175c1fe..9f54ab89bd7 100644
--- a/spring-framework-reference/src/beans-dependencies.xml
+++ b/spring-framework-reference/src/beans-dependencies.xml
@@ -532,7 +532,7 @@ public class ExampleBean {
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:p="http://www.springframework.org/schema/p"
      xsi:schemaLocation="http://www.springframework.org/schema/beans
-     http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+     http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
 &lt;bean id="myDataSource" class="org.apache.commons.dbcp.BasicDataSource"
       destroy-method="close"
@@ -968,7 +968,7 @@ support=support@example.co.uk</programlisting>
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:p="http://www.springframework.org/schema/p"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+      http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;bean name="classic" class="com.example.ExampleBean"&gt;
       &lt;property name="email" value="foo@bar.com"/&gt;
@@ -991,7 +991,7 @@ support=support@example.co.uk</programlisting>
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:p="http://www.springframework.org/schema/p"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+      http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;bean name="john-classic" class="com.example.Person"&gt;
       &lt;property name="name" value="John Doe"/&gt;
diff --git a/spring-framework-reference/src/beans-extension-points.xml b/spring-framework-reference/src/beans-extension-points.xml
index 94a3a26dea8..332ef860937 100644
--- a/spring-framework-reference/src/beans-extension-points.xml
+++ b/spring-framework-reference/src/beans-extension-points.xml
@@ -175,9 +175,9 @@ public class InstantiationTracingBeanPostProcessor implements BeanPostProcessor
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:lang="http://www.springframework.org/schema/lang"
      xsi:schemaLocation="http://www.springframework.org/schema/beans
-         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+         http://www.springframework.org/schema/beans/spring-beans.xsd
          http://www.springframework.org/schema/lang
-         http://www.springframework.org/schema/lang/spring-lang-3.0.xsd"&gt;
+         http://www.springframework.org/schema/lang/spring-lang.xsd"&gt;
 
   &lt;lang:groovy id="messenger"
         script-source="classpath:org/springframework/scripting/groovy/Messenger.groovy"&gt;
diff --git a/spring-framework-reference/src/beans-scopes.xml b/spring-framework-reference/src/beans-scopes.xml
index 99d2a8d21b5..511b831ff00 100644
--- a/spring-framework-reference/src/beans-scopes.xml
+++ b/spring-framework-reference/src/beans-scopes.xml
@@ -398,9 +398,9 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:aop="http://www.springframework.org/schema/aop"
      xsi:schemaLocation="http://www.springframework.org/schema/beans
-         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+         http://www.springframework.org/schema/beans/spring-beans.xsd
          http://www.springframework.org/schema/aop
-         http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+         http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   <lineannotation>&lt;!-- an HTTP <interfacename>Session</interfacename>-scoped bean exposed as a proxy --&gt;</lineannotation>
   &lt;bean id="userPreferences" class="com.foo.UserPreferences" <emphasis role="bold">scope="session"</emphasis>&gt;
@@ -650,9 +650,9 @@ beanFactory.registerScope("<emphasis role="bold">thread</emphasis>", threadScope
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:aop="http://www.springframework.org/schema/aop"
      xsi:schemaLocation="http://www.springframework.org/schema/beans
-         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+         http://www.springframework.org/schema/beans/spring-beans.xsd
          http://www.springframework.org/schema/aop
-         http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+         http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;bean class="org.springframework.beans.factory.config.CustomScopeConfigurer"&gt;
       &lt;property name="scopes"&gt;
diff --git a/spring-framework-reference/src/beans.xml b/spring-framework-reference/src/beans.xml
index a2a38bea16d..e7b259d3fb6 100644
--- a/spring-framework-reference/src/beans.xml
+++ b/spring-framework-reference/src/beans.xml
@@ -183,7 +183,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
 &lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+           http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;bean id="..." class="..."&gt;
     &lt;!-- collaborators and configuration for this bean go here --&gt;
@@ -237,7 +237,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
 &lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+           http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;!-- services --&gt;
 
@@ -260,7 +260,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
 &lt;beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+           http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
   &lt;bean id="accountDao"
       class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapAccountDao"&gt;
diff --git a/spring-framework-reference/src/dynamic-languages.xml b/spring-framework-reference/src/dynamic-languages.xml
index da99b1bf369..25c575c14b8 100644
--- a/spring-framework-reference/src/dynamic-languages.xml
+++ b/spring-framework-reference/src/dynamic-languages.xml
@@ -126,8 +126,8 @@ class GroovyMessenger implements Messenger {
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:lang="http://www.springframework.org/schema/lang"
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
 
     ]]><lineannotation>&lt;!-- this is the bean definition for the Groovy-backed <interfacename>Messenger</interfacename> implementation --&gt;</lineannotation><![CDATA[
     <lang:groovy id="messenger" script-source="classpath:Messenger.groovy">
@@ -1038,8 +1038,8 @@ class TestBeanValidator implements Validator {
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:lang="http://www.springframework.org/schema/lang"
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
 
     <lang:groovy id="messenger" script-source="classpath:Messenger.groovy" ]]><lineannotation><emphasis role="bold">scope="prototype"</emphasis></lineannotation><![CDATA[>
         <lang:property name="message" value="I Can Do The RoboCop" />
diff --git a/spring-framework-reference/src/jdbc.xml b/spring-framework-reference/src/jdbc.xml
index d87f9c43c39..ea1b6c3b217 100644
--- a/spring-framework-reference/src/jdbc.xml
+++ b/spring-framework-reference/src/jdbc.xml
@@ -458,9 +458,9 @@ private static final class ActorMapper implements RowMapper&lt;Actor&gt; {
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+        http://www.springframework.org/schema/context/spring-context.xsd"&gt;
     
     &lt;bean id="corporateEventDao" class="com.example.JdbcCorporateEventDao"&gt;
         &lt;property name="dataSource" ref="dataSource"/&gt;
@@ -507,9 +507,9 @@ public class JdbcCorporateEventDao implements CorporateEventDao {
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+        http://www.springframework.org/schema/context/spring-context.xsd"&gt;
     
     &lt;!-- Scans within the base package of the application for @Components to configure as beans --&gt;
     &lt;context:component-scan base-package="org.springframework.docs.test" /&gt;
diff --git a/spring-framework-reference/src/jms.xml b/spring-framework-reference/src/jms.xml
index 19e720a12ea..76c57ea8297 100644
--- a/spring-framework-reference/src/jms.xml
+++ b/spring-framework-reference/src/jms.xml
@@ -917,8 +917,8 @@ public interface SessionAwareMessageListener {
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        <emphasis role="bold">xmlns:jms="http://www.springframework.org/schema/jms"</emphasis>
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-<emphasis role="bold">http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.0.xsd"</emphasis>&gt;
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+<emphasis role="bold">http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms.xsd"</emphasis>&gt;
 
 <lineannotation>&lt;!-- <literal>&lt;bean/&gt;</literal> definitions here --&gt;</lineannotation>
 
diff --git a/spring-framework-reference/src/mail.xml b/spring-framework-reference/src/mail.xml
index 63caf0695f6..012211773bf 100644
--- a/spring-framework-reference/src/mail.xml
+++ b/spring-framework-reference/src/mail.xml
@@ -372,7 +372,7 @@ public class SimpleRegistrationService implements RegistrationService {
 <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xsi:schemaLocation="http://www.springframework.org/schema/beans
-   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+   http://www.springframework.org/schema/beans/spring-beans.xsd">
 
    <bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
       <property name="host" value="mail.csonth.gov.uk"/>
diff --git a/spring-framework-reference/src/mvc.xml b/spring-framework-reference/src/mvc.xml
index 322410c2cea..18c3c64dbc6 100644
--- a/spring-framework-reference/src/mvc.xml
+++ b/spring-framework-reference/src/mvc.xml
@@ -728,9 +728,9 @@ public class HelloWorldController {
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/context 
-        http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+        http://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     &lt;context:component-scan base-package="org.springframework.samples.petclinic.web"/&gt;
 
@@ -4011,7 +4011,7 @@ public class SimpleController {
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+        http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     <lineannotation>&lt;!-- this bean with the well known name generates view names for us --&gt;</lineannotation>
     &lt;bean id="viewNameTranslator"
@@ -4161,9 +4161,9 @@ public class WebConfig {
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+        http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/mvc 
-        http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd"&gt;
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd"&gt;
 
     &lt;mvc:annotation-driven /&gt;
 
@@ -4307,7 +4307,7 @@ public class WebConfig extends WebMvcConfigurerAdapter {
 		<para>To customize the default configuration of 
         <literal>&lt;mvc:annotation-driven /&gt;</literal> check what
 		attributes and sub-elements it supports. You can view the 
-		<ulink url="http://static.springsource.org/schema/mvc/spring-mvc-3.1.xsd">Spring MVC XML schema</ulink>
+		<ulink url="http://static.springsource.org/schema/mvc/spring-mvc.xsd">Spring MVC XML schema</ulink>
 		or use the code completion feature of your IDE to discover
 		what attributes and sub-elements are available. 
 		The sample below shows a subset of what is available:</para>
diff --git a/spring-framework-reference/src/orm.xml b/spring-framework-reference/src/orm.xml
index f64a463ede4..e2c9b2c8cc8 100644
--- a/spring-framework-reference/src/orm.xml
+++ b/spring-framework-reference/src/orm.xml
@@ -414,11 +414,11 @@ TR: REVISED, PLS REVIEW.-->This declarative transaction capability allows you
        xmlns:tx="http://www.springframework.org/schema/tx"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans 
-       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://www.springframework.org/schema/beans/spring-beans.xsd
        http://www.springframework.org/schema/tx 
-       http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+       http://www.springframework.org/schema/tx/spring-tx.xsd
        http://www.springframework.org/schema/aop 
-       http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+       http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   <lineannotation>&lt;!-- <interfacename>SessionFactory</interfacename>, <interfacename>DataSource</interfacename>, etc. omitted --&gt;</lineannotation>
 
@@ -507,11 +507,11 @@ TR: REVISED, PLS REVIEW.-->This declarative transaction capability allows you
        xmlns:tx="http://www.springframework.org/schema/tx"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans 
-       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://www.springframework.org/schema/beans/spring-beans.xsd
        http://www.springframework.org/schema/tx 
-       http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+       http://www.springframework.org/schema/tx/spring-tx.xsd
        http://www.springframework.org/schema/aop 
-       http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+       http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   <lineannotation>&lt;!-- <interfacename>SessionFactory</interfacename>, <interfacename>DataSource</interfacename>, etc. omitted --&gt;</lineannotation>
 
@@ -1150,11 +1150,11 @@ TR: OK AS IS. Two different callback methhods - one is Spring's (*afterCompletio
         xmlns:tx="http://www.springframework.org/schema/tx"
         xsi:schemaLocation="
    http://www.springframework.org/schema/beans 
-   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+   http://www.springframework.org/schema/beans/spring-beans.xsd
    http://www.springframework.org/schema/tx 
-   http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+   http://www.springframework.org/schema/tx/spring-tx.xsd
    http://www.springframework.org/schema/aop 
-   http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+   http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;bean id="myTxManager" class="org.springframework.orm.jdo.JdoTransactionManager"&gt;
     &lt;property name="persistenceManagerFactory" ref="myPmf"/&gt;
@@ -1731,11 +1731,11 @@ TR: REVISED, PLS REVIEW. Should be *inside your war*. --><!-- </para>
        xmlns:tx="http://www.springframework.org/schema/tx"
        xsi:schemaLocation="
        http://www.springframework.org/schema/beans 
-       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://www.springframework.org/schema/beans/spring-beans.xsd
        http://www.springframework.org/schema/tx 
-       http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+       http://www.springframework.org/schema/tx/spring-tx.xsd
        http://www.springframework.org/schema/aop 
-       http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+       http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;bean id="myTxManager" class="org.springframework.orm.jpa.JpaTransactionManager"&gt;
     &lt;property name="entityManagerFactory" ref="myEmf"/&gt;
diff --git a/spring-framework-reference/src/oxm.xml b/spring-framework-reference/src/oxm.xml
index 225c45216f0..ac3838daaac 100644
--- a/spring-framework-reference/src/oxm.xml
+++ b/spring-framework-reference/src/oxm.xml
@@ -318,9 +318,9 @@ public class Application {
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     ]]><emphasis role="bold"><![CDATA[xmlns:oxm="http://www.springframework.org/schema/oxm"]]></emphasis>
     <![CDATA[xsi:schemaLocation="http://www.springframework.org/schema/beans
-    ]]><![CDATA[http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+    ]]><![CDATA[http://www.springframework.org/schema/beans/spring-beans.xsd
     ]]><emphasis role="bold"><![CDATA[http://www.springframework.org/schema/oxm
-    ]]><![CDATA[http://www.springframework.org/schema/oxm/spring-oxm-3.0.xsd"]]></emphasis><![CDATA[>
+    ]]><![CDATA[http://www.springframework.org/schema/oxm/spring-oxm.xsd"]]></emphasis><![CDATA[>
 ]]></programlisting>
 		<para>
 			Currently, the following tags are available:
diff --git a/spring-framework-reference/src/portlet.xml b/spring-framework-reference/src/portlet.xml
index ec4ac3fcc79..97f1ead5ff7 100644
--- a/spring-framework-reference/src/portlet.xml
+++ b/spring-framework-reference/src/portlet.xml
@@ -1294,7 +1294,7 @@ public class FileUploadBean {
 &lt;beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+        http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     &lt;bean class="org.springframework.web.portlet.mvc.annotation.DefaultAnnotationHandlerMapping"/&gt;
 
@@ -1346,9 +1346,9 @@ public class FileUploadBean {
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/context
-        http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
+        http://www.springframework.org/schema/context/spring-context.xsd"&gt;
 
     &lt;context:component-scan base-package="org.springframework.samples.petportal.portlet"/&gt;
 
diff --git a/spring-framework-reference/src/remoting.xml b/spring-framework-reference/src/remoting.xml
index 360927d9573..575820682d4 100644
--- a/spring-framework-reference/src/remoting.xml
+++ b/spring-framework-reference/src/remoting.xml
@@ -1037,7 +1037,7 @@ public class SimpleCheckingAccountService implements CheckingAccountService {
 &lt;beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+        http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     &lt;bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory"&gt;
         &lt;property name="brokerURL" value="tcp://ep-t43:61616"/&gt;
@@ -1059,7 +1059,7 @@ public class SimpleCheckingAccountService implements CheckingAccountService {
 &lt;beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/beans
-         http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+         http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     &lt;bean id="checkingAccountService"
           class="org.springframework.jms.remoting.JmsInvokerServiceExporter"&gt;
@@ -1104,7 +1104,7 @@ public class Server {
 &lt;beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+        http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     &lt;bean id="checkingAccountService"
           class="org.springframework.jms.remoting.JmsInvokerProxyFactoryBean"&gt;
diff --git a/spring-framework-reference/src/testing.xml b/spring-framework-reference/src/testing.xml
index 9dbe84d626e..91c2c7787dc 100644
--- a/spring-framework-reference/src/testing.xml
+++ b/spring-framework-reference/src/testing.xml
@@ -1827,7 +1827,7 @@ public class HibernateTitleRepositoryTests {
 &lt;beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans 
-           http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
+           http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
 
     <lineannotation>&lt;!-- this bean will be injected into the <classname>HibernateTitleRepositoryTests</classname> class --&gt;</lineannotation>
     &lt;bean id="<emphasis role="bold">titleRepository</emphasis>" class="<emphasis
diff --git a/spring-framework-reference/src/transaction.xml b/spring-framework-reference/src/transaction.xml
index b2dbed4ce3e..57c5a9b8b15 100644
--- a/spring-framework-reference/src/transaction.xml
+++ b/spring-framework-reference/src/transaction.xml
@@ -375,9 +375,9 @@ TR:REVISED, PLS REVIEW-->
      xmlns:jee="http://www.springframework.org/schema/jee"
      xsi:schemaLocation="
      http://www.springframework.org/schema/beans 
-     http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans/spring-beans.xsd
      http://www.springframework.org/schema/jee 
-     http://www.springframework.org/schema/jee/spring-jee-3.0.xsd"&gt;
+     http://www.springframework.org/schema/jee/spring-jee.xsd"&gt;
 
   &lt;jee:jndi-lookup id="dataSource" jndi-name="jdbc/jpetstore"/&gt; 
 
@@ -798,11 +798,11 @@ public class DefaultFooService implements FooService {
      <lineannotation><emphasis role="bold">xmlns:tx="http://www.springframework.org/schema/tx"</emphasis></lineannotation>
      xsi:schemaLocation="
      http://www.springframework.org/schema/beans 
-     http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans/spring-beans.xsd
      <lineannotation><emphasis role="bold">http://www.springframework.org/schema/tx
-     http://www.springframework.org/schema/tx/spring-tx-3.0.xsd</emphasis></lineannotation>
+     http://www.springframework.org/schema/tx/spring-tx.xsd</emphasis></lineannotation>
      http://www.springframework.org/schema/aop 
-     http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+     http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
   
   <lineannotation>&lt;!-- this is the service object that we want to make transactional --&gt;</lineannotation>
   &lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
@@ -1083,11 +1083,11 @@ if the underlying application server infrastructure throws an Error the transact
   xmlns:tx="http://www.springframework.org/schema/tx"
   xsi:schemaLocation="
   http://www.springframework.org/schema/beans 
-  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+  http://www.springframework.org/schema/beans/spring-beans.xsd
   http://www.springframework.org/schema/tx 
-  http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+  http://www.springframework.org/schema/tx/spring-tx.xsd
   http://www.springframework.org/schema/aop 
-  http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+  http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;aop:config&gt;
 
@@ -1127,11 +1127,11 @@ if the underlying application server infrastructure throws an Error the transact
   xmlns:tx="http://www.springframework.org/schema/tx"
   xsi:schemaLocation="
   http://www.springframework.org/schema/beans 
-  http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+  http://www.springframework.org/schema/beans/spring-beans.xsd
   http://www.springframework.org/schema/tx 
-  http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+  http://www.springframework.org/schema/tx/spring-tx.xsd
   http://www.springframework.org/schema/aop 
-  http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+  http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;aop:config&gt;
 
@@ -1360,11 +1360,11 @@ public class DefaultFooService implements FooService {
      xmlns:tx="http://www.springframework.org/schema/tx"
      xsi:schemaLocation="
      http://www.springframework.org/schema/beans 
-     http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans/spring-beans.xsd
      http://www.springframework.org/schema/tx 
-     http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+     http://www.springframework.org/schema/tx/spring-tx.xsd
      http://www.springframework.org/schema/aop 
-     http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+     http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
   
   <lineannotation>&lt;!-- this is the service object that we want to make transactional --&gt;</lineannotation>
   &lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
@@ -2008,11 +2008,11 @@ public class SimpleProfiler implements Ordered {
      xmlns:tx="http://www.springframework.org/schema/tx"
      xsi:schemaLocation="
    http://www.springframework.org/schema/beans 
-   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+   http://www.springframework.org/schema/beans/spring-beans.xsd
    http://www.springframework.org/schema/tx 
-   http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+   http://www.springframework.org/schema/tx/spring-tx.xsd
    http://www.springframework.org/schema/aop 
-   http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+   http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
 
@@ -2063,11 +2063,11 @@ TR: REVISED, PLS REVIEW. changed to 'desired'; seems clear that the desired orde
      xmlns:tx="http://www.springframework.org/schema/tx"
      xsi:schemaLocation="
    http://www.springframework.org/schema/beans 
-   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+   http://www.springframework.org/schema/beans/spring-beans.xsd
    http://www.springframework.org/schema/tx 
-   http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
+   http://www.springframework.org/schema/tx/spring-tx.xsd
    http://www.springframework.org/schema/aop 
-   http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
+   http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
 
   &lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
 
diff --git a/spring-framework-reference/src/validation.xml b/spring-framework-reference/src/validation.xml
index 08d6d02959d..652e55b3474 100644
--- a/spring-framework-reference/src/validation.xml
+++ b/spring-framework-reference/src/validation.xml
@@ -1435,9 +1435,9 @@ public interface FormatterRegistrar {
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <mvc:annotation-driven/>
 
@@ -1459,9 +1459,9 @@ public interface FormatterRegistrar {
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <mvc:annotation-driven conversion-service="conversionService"/>
 
@@ -1749,9 +1749,9 @@ public class MyController {
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <mvc:annotation-driven validator="globalValidator"/>
 
@@ -1778,9 +1778,9 @@ public class MyController {
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans
-        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
     <!-- JSR-303 support will be detected on classpath and enabled automatically -->
     <mvc:annotation-driven/>
diff --git a/spring-framework-reference/src/web-integration.xml b/spring-framework-reference/src/web-integration.xml
index e141362af61..bde91515a6c 100644
--- a/spring-framework-reference/src/web-integration.xml
+++ b/spring-framework-reference/src/web-integration.xml
@@ -657,8 +657,8 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        <emphasis role="bold">xmlns:jee="http://www.springframework.org/schema/jee"</emphasis>
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-<emphasis role="bold">http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.0.xsd"</emphasis>&gt;
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+<emphasis role="bold">http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd"</emphasis>&gt;
  
 &lt;beans&gt;
     &lt;!-- the DataSource --&gt;
diff --git a/spring-framework-reference/src/xml-custom.xml b/spring-framework-reference/src/xml-custom.xml
index 46ae1ea2096..64ecc3670ac 100644
--- a/spring-framework-reference/src/xml-custom.xml
+++ b/spring-framework-reference/src/xml-custom.xml
@@ -266,7 +266,7 @@ public class SimpleDateFormatBeanDefinitionParser extends AbstractSingleBeanDefi
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:myns="http://www.mycompany.com/schema/myns"
       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.mycompany.com/schema/myns http://www.mycompany.com/schema/myns/myns.xsd">
 
    ]]><lineannotation>&lt;!-- as a top-level bean --&gt;</lineannotation><![CDATA[
@@ -293,7 +293,7 @@ http://www.mycompany.com/schema/myns http://www.mycompany.com/schema/myns/myns.x
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:foo="http://www.foo.com/schema/component"
       xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 http://www.foo.com/schema/component http://www.foo.com/schema/component/component.xsd">
 
    ]]><lineannotation><![CDATA[<foo:component id="bionic-family" name="Bionic-1">
diff --git a/spring-framework-reference/src/xsd-configuration.xml b/spring-framework-reference/src/xsd-configuration.xml
index 9e66092ff36..5d48b6286ba 100644
--- a/spring-framework-reference/src/xsd-configuration.xml
+++ b/spring-framework-reference/src/xsd-configuration.xml
@@ -68,7 +68,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 ]]><lineannotation>&lt;!-- <literal>&lt;bean/&gt;</literal> definitions here --&gt;</lineannotation><![CDATA[
 
@@ -106,8 +106,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:util="http://www.springframework.org/schema/util"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- <literal>&lt;bean/&gt;</literal> definitions here --&gt;</lineannotation><![CDATA[
 
@@ -477,8 +477,8 @@ public class Client {
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:jee="http://www.springframework.org/schema/jee"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-3.0.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- <literal>&lt;bean/&gt;</literal> definitions here --&gt;</lineannotation><![CDATA[
 
@@ -636,8 +636,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:lang="http://www.springframework.org/schema/lang"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- <literal>&lt;bean/&gt;</literal> definitions here --&gt;</lineannotation><![CDATA[
 
@@ -661,8 +661,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:jms="http://www.springframework.org/schema/jms"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.0.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- <literal>&lt;bean/&gt;</literal> definitions here --&gt;</lineannotation><![CDATA[
 
@@ -675,7 +675,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
             covered in the chapter entitled <xref linkend="transaction"/>.</para>
             <tip>
                 <para>You are strongly encouraged to look at the
-                <filename>'spring-tx-3.0.xsd'</filename> file that ships with the Spring
+                <filename>'spring-tx.xsd'</filename> file that ships with the Spring
                 distribution. This file is (of course), the XML Schema for Spring's
                 transaction configuration, and covers all of the various tags in the
                 <literal>tx</literal> namespace, including attribute defaults and
@@ -694,9 +694,9 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:aop="http://www.springframework.org/schema/aop"
        ]]><emphasis role="bold">xmlns:tx="http://www.springframework.org/schema/tx"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd</emphasis><![CDATA[
-http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd</emphasis><![CDATA[
+http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
 
 ]]><lineannotation>&lt;!-- <literal>&lt;bean/&gt;</literal> definitions here --&gt;</lineannotation><![CDATA[
 
@@ -724,8 +724,8 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:aop="http://www.springframework.org/schema/aop"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- <literal>&lt;bean/&gt;</literal> definitions here --&gt;</lineannotation><![CDATA[
 
@@ -744,8 +744,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        ]]><emphasis role="bold">xmlns:context="http://www.springframework.org/schema/context"</emphasis><![CDATA[
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-]]><emphasis role="bold">http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"</emphasis><![CDATA[>
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+]]><emphasis role="bold">http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"</emphasis><![CDATA[>
 
 ]]><lineannotation>&lt;!-- <literal>&lt;bean/&gt;</literal> definitions here --&gt;</lineannotation><![CDATA[
 
@@ -808,7 +808,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
             Spring as they are currently undergoing review. If you are a third party tool
             vendor and you would like to contribute to this review process, then do mail
             the Spring mailing list. The currently supported <literal>tool</literal>
-            tags can be found in the file <literal>'spring-tool-3.0.xsd'</literal> in the
+            tags can be found in the file <literal>'spring-tool.xsd'</literal> in the
             <literal>'src/org/springframework/beans/factory/xml'</literal> directory of the
             Spring source distribution.</para>
         </section>
@@ -832,7 +832,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <bean id="foo" class="x.y.Foo">
         ]]><emphasis role="bold"><![CDATA[<meta key="cacheName" value="foo"/>]]></emphasis><![CDATA[
@@ -877,8 +877,8 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
-http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
 </beans>]]></programlisting>
                 <para>
@@ -999,8 +999,8 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:util="http://www.springframework.org/schema/util"
        xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
 </beans>]]></programlisting>
                 <para>
@@ -1084,7 +1084,7 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema
                 relevant XSD file. As can be seen in the following screenshot, the
                 <literal>'http://www.springframework.org/schema/util'</literal> namespace
                 is being associated with the file resource
-                <literal>'C:\bench\spring\src\org\springframework\beans\factory\xml\spring-util-3.0.xsd'</literal>.</para>
+                <literal>'C:\bench\spring\src\org\springframework\beans\factory\xml\spring-util.xsd'</literal>.</para>
                 <para>
                     <mediaobject>
                         <imageobject role="fo">