diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryConfig.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryConfig.java
index 9c3b0f4a3..f3d652f46 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryConfig.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/config/RepositoryConfig.java
@@ -92,7 +92,7 @@ public abstract class RepositoryConfig<T extends SingleRepositoryConfigInformati
      */
     public boolean configureManually() {
 
-        return getRepositoryNodes().size() > 0;
+        return getRepositoryElements().size() > 0;
     }
 
 
@@ -182,15 +182,15 @@ public abstract class RepositoryConfig<T extends SingleRepositoryConfigInformati
     public Iterable<T> getSingleRepositoryConfigInformations() {
 
         Set<T> infos = new HashSet<T>();
-        for (Element element : getRepositoryNodes()) {
-            infos.add(createSingleRepositoryConfigInformationFor(element));
+        for (Element repositoryElement : getRepositoryElements()) {
+            infos.add(createSingleRepositoryConfigInformationFor(repositoryElement));
         }
 
         return infos;
     }
 
 
-    private Collection<Element> getRepositoryNodes() {
+    private Collection<Element> getRepositoryElements() {
 
         NodeList nodes = element.getChildNodes();
         Set<Element> result = new HashSet<Element>();
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/SimpleParameterAccessor.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/SimpleParameterAccessor.java
index 72cb263c8..9f8e8032e 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/SimpleParameterAccessor.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/SimpleParameterAccessor.java
@@ -46,7 +46,7 @@ public class SimpleParameterAccessor {
                 "Invalid number of parameters given!");
 
         this.parameters = parameters;
-        this.values = values;
+        this.values = values.clone();
     }
 
 
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java
index 2d5c05e59..f6997904a 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java
@@ -61,7 +61,7 @@ public abstract class AbstractQueryCreator<T, S> {
      */
     public T createQuery() {
 
-        return finalize(createCriteria(tree), tree.getSort());
+        return complete(createCriteria(tree), tree.getSort());
     }
 
 
@@ -136,5 +136,5 @@ public abstract class AbstractQueryCreator<T, S> {
      * @param sort
      * @return
      */
-    protected abstract T finalize(S criteria, Sort sort);
+    protected abstract T complete(S criteria, Sort sort);
 }
diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/PartTree.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/PartTree.java
index 63b2d7911..924a0cb55 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/PartTree.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/PartTree.java
@@ -116,7 +116,7 @@ public class PartTree implements Iterable<OrPart> {
      * @param keyword
      * @return
      */
-    private String[] split(String text, String keyword) {
+    private static String[] split(String text, String keyword) {
 
         String regex = format(KEYWORD_TEMPLATE, keyword);
 
@@ -152,7 +152,7 @@ public class PartTree implements Iterable<OrPart> {
      * 
      * @author Oliver Gierke
      */
-    public class OrPart implements Iterable<Part> {
+    public static class OrPart implements Iterable<Part> {
 
         private final List<Part> children = new ArrayList<Part>();