diff --git a/.springBeans b/.springBeans
index 0c2dbe44c2c9ff5df22a6e1f98f581b1db7b8497..c4469cbf0fc3825855fef1497fb65f31625abb9b 100644
--- a/.springBeans
+++ b/.springBeans
@@ -10,6 +10,7 @@
 		<config>src/main/resources/spring/datasource-config.xml</config>
 		<config>src/main/resources/spring/mvc-core-config.xml</config>
 		<config>src/main/resources/spring/mvc-view-config.xml</config>
+		<config>src/main/resources/spring/business-config.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/src/main/resources/spring/dao-config.xml b/src/main/resources/spring/business-config.xml
similarity index 100%
rename from src/main/resources/spring/dao-config.xml
rename to src/main/resources/spring/business-config.xml
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index ef04c4a18b468f9e98ae954adf48a792322c81f5..678af936e9ac348e6bf5e6037f9f2a43550e239b 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -10,7 +10,7 @@
 
     <context-param>
         <param-name>spring.profiles.active</param-name>
-        <param-value>jdbc</param-value>
+        <param-value>jpa</param-value>
         <!-- Available profiles:
             <param-value>jdbc</param-value>
             <param-value>jpa</param-value> (in the case of plain JPA)
@@ -24,7 +24,7 @@
     -->
     <context-param>
         <param-name>contextConfigLocation</param-name>
-        <param-value>classpath:spring/dao-config.xml, classpath:spring/tools-config.xml</param-value>
+        <param-value>classpath:spring/business-config.xml, classpath:spring/tools-config.xml</param-value>
     </context-param>
 
     <listener>
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImplTests.java
index fb6f1f8894d44c032b83c830957a4a44929a0829..f821dbf2a406ccf771948b95e6a53ec2fb7f4d03 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImplTests.java
@@ -27,7 +27,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy
  */
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jdbc")
 public class JdbcOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImplTests.java
index 008818fc33718b25b5a18d01bcc0d9827b99de0f..403d5f219cdd6ab067a584fc5dee4d4adfaf7183 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImplTests.java
@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy
  */
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jdbc")
 public class JdbcPetRepositoryImplTests extends AbstractPetRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImplTests.java
index e2a4e8b7b00db8a19a1b35b1d8012727fb324903..dd94080eb601db252c400e54488ad120d716fedd 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImplTests.java
@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy
  */
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jdbc")
 public class JdbcVetRepositoryImplTests extends AbstractVetRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImplTests.java
index 6a349889296e261d01206797092d875fbccabaf8..43c5036416c7df6c58ab0759f906ed2da3a0954b 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImplTests.java
@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy
  */
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jdbc")
 public class JdbcVisitRepositoryImplTests extends AbstractVisitRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImplTests.java
index 2936515b000f54e33fe53e597b1a24bc146fa8b5..77462cdfb6e04a3b15e570d71f26eff10de93653 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaOwnerRepositoryImplTests.java
@@ -18,7 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Michael Isvy
  */
 
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jpa")
 public class JpaOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImplTests.java
index ec5b503377f04d3f185800fdbf112868dad5a066..96b8df3496a374f89f620684f7e875e7ccaaa071 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaPetRepositoryImplTests.java
@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy
  */
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jpa")
 public class JpaPetRepositoryImplTests extends AbstractPetRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImplTests.java
index 433f34cc683131f875240f07aa8063b49905e022..3289153ef680d4f4fdf81dab86bfa92bd5551d97 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaVetRepositoryImplTests.java
@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy
  */
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jpa")
 public class JpaVetRepositoryImplTests extends AbstractVetRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImplTests.java
index 97e728a23365805617a76c08e63c1c5bcf9e42fa..dbaffde4b1766dcca7afd98e34a7152aea5f2ee5 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/jpa/JpaVisitRepositoryImplTests.java
@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy
  */
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("jpa")
 public class JpaVisitRepositoryImplTests extends AbstractVisitRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaOwnerRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaOwnerRepositoryImplTests.java
index 3130dc604078f7b17d2817aa992be32704b6706e..1cb385a738a8d7b767f4a790210f704ef8bb4ce7 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaOwnerRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaOwnerRepositoryImplTests.java
@@ -18,7 +18,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Michael Isvy
  */
 
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("spring-data-jpa")
 public class JpaOwnerRepositoryImplTests extends AbstractOwnerRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaPetRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaPetRepositoryImplTests.java
index 842380d513169e299be9aecc3d741d8520c79364..f3fefdaa6f8db54dbb08b07e9258b3ea0129e8c3 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaPetRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaPetRepositoryImplTests.java
@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy
  */
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("spring-data-jpa")
 public class JpaPetRepositoryImplTests extends AbstractPetRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaVetRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaVetRepositoryImplTests.java
index 204cb6a7ba91830fe93a4d2bad1dc0699e48ab00..f3583b1b5e093aeb46f0c39d77941745a424dca1 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaVetRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaVetRepositoryImplTests.java
@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy
  */
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("spring-data-jpa")
 public class JpaVetRepositoryImplTests extends AbstractVetRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaVisitRepositoryImplTests.java b/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaVisitRepositoryImplTests.java
index 0705700ae6641291149ff440033c1192f7a81052..a3b37ed001b2ebbf0f537bedc8f09a845936dc4f 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaVisitRepositoryImplTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/JpaVisitRepositoryImplTests.java
@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Thomas Risberg
  * @author Michael Isvy
  */
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("spring-data-jpa")
 public class JpaVisitRepositoryImplTests extends AbstractVisitRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepositoryTests.java b/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepositoryTests.java
index de53fa0489bb52f592423a296340fbe4be74d518..28fc5f1f8920df1a58490f9b558339663c2500e6 100644
--- a/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepositoryTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/repository/springdatajpa/SpringDataOwnerRepositoryTests.java
@@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Michael Isvy
  */
 
-@ContextConfiguration(locations = {"classpath:spring/dao-config.xml"})
+@ContextConfiguration(locations = {"classpath:spring/business-config.xml"})
 @RunWith(SpringJUnit4ClassRunner.class)
 @ActiveProfiles("spring-data-jpa")
 public class SpringDataOwnerRepositoryTests extends AbstractOwnerRepositoryTests {
diff --git a/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTest-config.xml b/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTest-config.xml
index 75f913087391e261b2669b92780e584fd00aac86..8458ba2ec9682a3e9fa9cc3db33b365a258cf53d 100644
--- a/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTest-config.xml
+++ b/src/test/java/org/springframework/samples/petclinic/web/VisitsViewTest-config.xml
@@ -7,7 +7,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans
        http://www.springframework.org/schema/beans/spring-beans.xsd">
 
-    <import resource="classpath:spring/dao-config.xml"/>
+    <import resource="classpath:spring/business-config.xml"/>
     <import resource="classpath:spring/mvc-core-config.xml"/>
 
 </beans>