diff --git a/src/main/java/org/hbp/mip/controllers/AppsApi.java b/src/main/java/org/hbp/mip/controllers/AppsApi.java
index 2134a908758c6c41b1e9a6f1b2f35ea265c21008..cdfafeb6191a12bf37714bc7fac78d24d344996a 100644
--- a/src/main/java/org/hbp/mip/controllers/AppsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/AppsApi.java
@@ -57,7 +57,7 @@ public class AppsApi {
         User user = mipApplication.getUser();
         App app = appRepository.findOne(id);
 
-        Vote vote = voteRepository.find(user, app).iterator().next();
+        Vote vote = voteRepository.findByUserAndApp(user, app).iterator().next();
 
         if (vote != null) {
             vote.setValue(value);
diff --git a/src/main/java/org/hbp/mip/controllers/ExperimentApi.java b/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
index c25f493e718b723e166a25059202976e74ff01c0..558b7edaa658f12877228717b33201356c1d101c 100644
--- a/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ExperimentApi.java
@@ -214,10 +214,10 @@ public class ExperimentApi {
         User user = mipApplication.getUser();
         Iterable<Experiment> experiments = null;
 
-        Iterable<Experiment> myExperiments = experimentRepository.findByUser(user);
+        Iterable<Experiment> myExperiments = experimentRepository.findByCreatedBy(user);
         if(!mine)
         {
-            Iterable<Experiment> sharedExperiments = experimentRepository.findShared(true);
+            Iterable<Experiment> sharedExperiments = experimentRepository.findByShared(true);
             experiments = Iterables.concat(myExperiments, sharedExperiments);
         }
 
diff --git a/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java b/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java
index 17d8d5fb4ed712c6c2d04388abd9201e0d211775..3815879beab40747df7fba83f2a96d950af3ece9 100644
--- a/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java
+++ b/src/main/java/org/hbp/mip/repositories/ExperimentRepository.java
@@ -11,6 +11,6 @@ import java.util.UUID;
  */
 
 public interface ExperimentRepository extends CrudRepository<Experiment, UUID> {
-    Iterable<Experiment> findByUser(User user);
-    Iterable<Experiment> findShared(Boolean shared);
+    Iterable<Experiment> findByCreatedBy(User user);
+    Iterable<Experiment> findByShared(Boolean shared);
 }
diff --git a/src/main/java/org/hbp/mip/repositories/VoteRepository.java b/src/main/java/org/hbp/mip/repositories/VoteRepository.java
index 45e44fa1cb0cab3f159e3390240155d7b6e4ee52..78d760b9cb998b65a444d3472bbf3326a3052979 100644
--- a/src/main/java/org/hbp/mip/repositories/VoteRepository.java
+++ b/src/main/java/org/hbp/mip/repositories/VoteRepository.java
@@ -10,5 +10,5 @@ import org.springframework.data.repository.CrudRepository;
  */
 
 public interface VoteRepository extends CrudRepository<Vote, Long> {
-    Iterable<Vote> find(User user, App app);
+    Iterable<Vote> findByUserAndApp(User user, App app);
 }