diff --git a/templates/jpa-paginated-repository.java.mustache b/templates/jpa-paginated-repository.java.mustache
index 6535f19..1e3b4ea 100644
--- a/templates/jpa-paginated-repository.java.mustache
+++ b/templates/jpa-paginated-repository.java.mustache
@@ -21,7 +21,7 @@ import {{{.}}};
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.PagingAndSortingRepository;
 
-public interface {{record_type}}Repository extends PagingAndSortingRepository<{{pkey_type.name}}, {{record_type}}> {
+public interface {{record_type}}Repository extends PagingAndSortingRepository<{{record_type}}, {{pkey_type.name}}> {
 
     {{#indexes}}
     List<{{record_type}}> findAllBy{{namePascalCase}}(@NonNull {{type.name}} {{name}}, Pageable pagination);
diff --git a/templates/jpa-repository.java.mustache b/templates/jpa-repository.java.mustache
index b299948..da2d7b2 100644
--- a/templates/jpa-repository.java.mustache
+++ b/templates/jpa-repository.java.mustache
@@ -20,7 +20,7 @@ import {{{.}}};
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface {{record_type}}Repository extends JpaRepository<{{pkey_type.name}}, {{record_type}}> {
+public interface {{record_type}}Repository extends JpaRepository<{{record_type}}, {{pkey_type.name}}> {
 
     {{#indexes}}
     List<{{record_type}}> findAllBy{{namePascalCase}}(@NonNull {{type.name}} {{name}});