diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImplExt.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryExtImpl.java
similarity index 93%
rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImplExt.java
rename to src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryExtImpl.java
index e7115b8da..f3d75eb67 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryImplExt.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcOwnerRepositoryExtImpl.java
@@ -18,12 +18,12 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 @Qualifier("OwnerRepositoryExt")
-public class JdbcOwnerRepositoryImplExt extends JdbcOwnerRepositoryImpl implements OwnerRepositoryExt {
+public class JdbcOwnerRepositoryExtImpl extends JdbcOwnerRepositoryImpl implements OwnerRepositoryExt {
 	
     private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
 
   	@Autowired
-	public JdbcOwnerRepositoryImplExt(DataSource dataSource) {
+	public JdbcOwnerRepositoryExtImpl(DataSource dataSource) {
 		super(dataSource);
 		// TODO  super() ?
 	    this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImplExt.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryExtImpl.java
similarity index 93%
rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImplExt.java
rename to src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryExtImpl.java
index f6892b376..546e6dbd5 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryImplExt.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcPetRepositoryExtImpl.java
@@ -19,12 +19,12 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 @Qualifier("PetRepositoryExt")
-public class JdbcPetRepositoryImplExt extends JdbcPetRepositoryImpl implements PetRepositoryExt {
+public class JdbcPetRepositoryExtImpl extends JdbcPetRepositoryImpl implements PetRepositoryExt {
 	
 	private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
 
 	@Autowired
-    public JdbcPetRepositoryImplExt(DataSource dataSource,
+    public JdbcPetRepositoryExtImpl(DataSource dataSource,
     		@Qualifier("OwnerRepositoryExt") OwnerRepositoryExt ownerRepository,
     		@Qualifier("VisitRepositoryExt") VisitRepositoryExt visitRepository) {
 		super(dataSource, ownerRepository, visitRepository);
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImplExt.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryExtImpl.java
similarity index 95%
rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImplExt.java
rename to src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryExtImpl.java
index 13e6d2943..b7bee0a20 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryImplExt.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVetRepositoryExtImpl.java
@@ -22,7 +22,7 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 @Qualifier("VetRepositoryExt")
-public class JdbcVetRepositoryImplExt extends JdbcVetRepositoryImpl implements VetRepositoryExt {
+public class JdbcVetRepositoryExtImpl extends JdbcVetRepositoryImpl implements VetRepositoryExt {
 	
 	//private JdbcTemplate jdbcTemplate;
 	
@@ -31,7 +31,7 @@ public class JdbcVetRepositoryImplExt extends JdbcVetRepositoryImpl implements V
     private SimpleJdbcInsert insertVet;
 
 	@Autowired
-	public JdbcVetRepositoryImplExt(DataSource dataSource, JdbcTemplate jdbcTemplate) {
+	public JdbcVetRepositoryExtImpl(DataSource dataSource, JdbcTemplate jdbcTemplate) {
 		super(jdbcTemplate);
 		// TODO Auto-generated constructor stub
 		//this.jdbcTemplate = jdbcTemplate;
diff --git a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImplExt.java b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryExtImpl.java
similarity index 94%
rename from src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImplExt.java
rename to src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryExtImpl.java
index 891abe37b..dc291c93d 100644
--- a/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryImplExt.java
+++ b/src/main/java/org/springframework/samples/petclinic/repository/jdbc/JdbcVisitRepositoryExtImpl.java
@@ -19,12 +19,12 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 @Qualifier("VisitRepositoryExt")
-public class JdbcVisitRepositoryImplExt extends JdbcVisitRepositoryImpl implements VisitRepositoryExt {
+public class JdbcVisitRepositoryExtImpl extends JdbcVisitRepositoryImpl implements VisitRepositoryExt {
 	
 	private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
 
 	@Autowired
-	public JdbcVisitRepositoryImplExt(DataSource dataSource) {
+	public JdbcVisitRepositoryExtImpl(DataSource dataSource) {
 		super(dataSource);
 		// TODO Auto-generated constructor stub
 		this.namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(dataSource);