diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoEntityInformation.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoEntityInformation.java
index 1d62c6d50..27163d67d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoEntityInformation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoEntityInformation.java
@@ -32,7 +32,7 @@ import org.springframework.util.ReflectionUtils;
  */
 class MongoEntityInformation implements IsNewAware, IdAware {
 
-    private final List<String> FIELD_NAMES = Arrays.asList("ID", "id", "_id");
+    private static final List<String> FIELD_NAMES = Arrays.asList("ID", "id", "_id");
     private Field field;
 
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java
index 0f752dcdc..434bb14d3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/MongoQueryCreator.java
@@ -106,7 +106,7 @@ class MongoQueryCreator extends AbstractQueryCreator<DBObject, QueryBuilder> {
      * #finalize(java.lang.Object)
      */
     @Override
-    protected DBObject finalize(QueryBuilder criteria, Sort sort) {
+    protected DBObject complete(QueryBuilder criteria, Sort sort) {
 
         return criteria.get();
     }