diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
index a1773d7af..32c142762 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java
@@ -12,7 +12,7 @@ public enum FxmlFile {
 	ERROR("/fxml/error.fxml"), //
 	FORGET_PASSWORD("/fxml/forget_password.fxml"), //
 	HEALTH_START("/fxml/health_start.fxml"), //
-	HEALTH_CHECK("/fxml/health_check.fxml"), //
+	HEALTH_CHECK("/fxml/health_check_list.fxml"), //
 	LOCK_FORCED("/fxml/lock_forced.fxml"), //
 	LOCK_FAILED("/fxml/lock_failed.fxml"), //
 	MAIN_WINDOW("/fxml/main_window.fxml"), //
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
similarity index 93%
rename from main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
rename to main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
index b7115e2d5..cf73e1127 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/CheckController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/CheckListController.java
@@ -27,9 +27,9 @@ import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 @HealthCheckScoped
-public class CheckController implements FxController {
+public class CheckListController implements FxController {
 
-	private static final Logger LOG = LoggerFactory.getLogger(CheckController.class);
+	private static final Logger LOG = LoggerFactory.getLogger(CheckListController.class);
 	private static final Set<Worker.State> endStates = Set.of(Worker.State.FAILED, Worker.State.CANCELLED, Worker.State.SUCCEEDED);
 
 	private final ObservableList<HealthCheckTask> tasks;
@@ -49,7 +49,7 @@ public class CheckController implements FxController {
 
 
 	@Inject
-	public CheckController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, ResourceBundle resourceBundle) {
+	public CheckListController(Lazy<Collection<HealthCheckTask>> tasks, ReportWriter reportWriteTask, ObjectProperty<HealthCheckTask> selectedTask, ExecutorService executorService, ResourceBundle resourceBundle) {
 		this.tasks = FXCollections.observableArrayList(tasks.get());
 		this.reportWriter = reportWriteTask;
 		this.executorService = executorService;
diff --git a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
index a410d3f13..aafb5cb22 100644
--- a/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java
@@ -27,6 +27,7 @@ import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import java.security.SecureRandom;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Map;
 import java.util.Optional;
@@ -125,8 +126,8 @@ abstract class HealthCheckModule {
 
 	@Binds
 	@IntoMap
-	@FxControllerKey(CheckController.class)
-	abstract FxController bindChecksController(CheckController controller);
+	@FxControllerKey(CheckListController.class)
+	abstract FxController bindCheckController(CheckListController controller);
 
 	@Binds
 	@IntoMap
diff --git a/main/ui/src/main/resources/fxml/health_check.fxml b/main/ui/src/main/resources/fxml/health_check_list.fxml
similarity index 97%
rename from main/ui/src/main/resources/fxml/health_check.fxml
rename to main/ui/src/main/resources/fxml/health_check_list.fxml
index 75efd0465..67f770304 100644
--- a/main/ui/src/main/resources/fxml/health_check.fxml
+++ b/main/ui/src/main/resources/fxml/health_check_list.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.VBox?>
 <VBox xmlns:fx="http://javafx.com/fxml"
 	  xmlns="http://javafx.com/javafx"
-	  fx:controller="org.cryptomator.ui.health.CheckController"
+	  fx:controller="org.cryptomator.ui.health.CheckListController"
 	  minWidth="400"
 	  maxWidth="400"
 	  minHeight="145"