diff --git a/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java b/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java
index af32ff950f6fcd3cf86b12a3d7a051defc1b490c..42557da8c90d0de3700c968531b3a4749517a8ff 100644
--- a/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java
+++ b/src/main/java/eu/hbp/mip/akka/AkkaClusterHealthCheck.java
@@ -15,13 +15,13 @@ public class AkkaClusterHealthCheck implements HealthIndicator {
     private ActorRef wokenMediator;
 
     @Autowired
-    private Cluster cluster;
+    private Cluster wokenCluster;
 
     @Override
     public Health health() {
-        if (cluster.state().getLeader() == null) {
+        if (wokenCluster.state().getLeader() == null) {
             return Health.down().withDetail("Error", "No leader in the cluster").build();
-        } else if (!cluster.state().allRoles().contains("woken")) {
+        } else if (!wokenCluster.state().allRoles().contains("woken")) {
             return Health.down().withDetail("Error", "Woken server cannot be seen in the cluster").build();
         }
         return Health.up().build();
diff --git a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
index 6351d4711387bc4dbc2f4e0920e3c91c027ddbf9..4163f8c7511e5b01fade799c5f44a4ad9d9fcbd6 100644
--- a/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java
@@ -49,7 +49,7 @@ class AkkaConfiguration {
     }
 
     @Bean
-    public Cluster cluster() {
+    public Cluster wokenCluster() {
         return new Cluster(actorSystem());
     }