diff --git a/client/src/main/java/ctbrec/ui/ThumbCell.java b/client/src/main/java/ctbrec/ui/ThumbCell.java
index 4f1cecc8..8f20336b 100644
--- a/client/src/main/java/ctbrec/ui/ThumbCell.java
+++ b/client/src/main/java/ctbrec/ui/ThumbCell.java
@@ -97,7 +97,7 @@ public class ThumbCell extends StackPane {
         this.thumbCellList = parent.grid.getChildren();
         this.model = model;
         this.recorder = recorder;
-        recording = recorder.isRecording(model);
+        recording = recorder.isTracked(model);
         model.setSuspended(recorder.isSuspended(model));
         this.setStyle("-fx-background-color: -fx-base");
 
@@ -576,7 +576,7 @@ public class ThumbCell extends StackPane {
 
     private void update() {
         model.setSuspended(recorder.isSuspended(model));
-        setRecording(recorder.isRecording(model));
+        setRecording(recorder.isTracked(model));
         setImage(model.getPreview());
         String txt = recording ? "    " : "";
         txt += model.getDescription() != null ? model.getDescription() : "";
diff --git a/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java b/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java
index b727b66b..c35c9404 100644
--- a/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java
+++ b/client/src/main/java/ctbrec/ui/ThumbOverviewTab.java
@@ -444,7 +444,7 @@ public class ThumbOverviewTab extends Tab implements TabSelectionListener {
         start.setOnAction((e) -> startStopAction(getSelectedThumbCells(cell), true));
         MenuItem stop = new MenuItem("Stop Recording");
         stop.setOnAction((e) -> startStopAction(getSelectedThumbCells(cell), false));
-        MenuItem startStop = recorder.isRecording(cell.getModel()) ? stop : start;
+        MenuItem startStop = recorder.isTracked(cell.getModel()) ? stop : start;
 
         MenuItem pause = new MenuItem("Pause Recording");
         pause.setOnAction((e) -> pauseResumeAction(getSelectedThumbCells(cell), true));
@@ -510,7 +510,7 @@ public class ThumbOverviewTab extends Tab implements TabSelectionListener {
         contextMenu.setHideOnEscape(true);
         contextMenu.setAutoFix(true);
         contextMenu.getItems().addAll(openInPlayer, startStop);
-        if(recorder.isRecording(cell.getModel())) {
+        if(recorder.isTracked(cell.getModel())) {
             contextMenu.getItems().add(pauseResume);
         }
         if(site.supportsFollow()) {
@@ -738,7 +738,7 @@ public class ThumbOverviewTab extends Tab implements TabSelectionListener {
         ObservableList<Node> thumbs = grid.getChildren();
         for (int i = thumbs.size()-1; i > 0; i--) {
             ThumbCell thumb = (ThumbCell) thumbs.get(i);
-            if(recorder.isRecording(thumb.getModel())) {
+            if(recorder.isTracked(thumb.getModel())) {
                 thumbs.remove(i);
                 thumbsToMove.add(0, thumb);
             }
diff --git a/common/src/main/java/ctbrec/recorder/LocalRecorder.java b/common/src/main/java/ctbrec/recorder/LocalRecorder.java
index 0c1d871d..94e1ca14 100644
--- a/common/src/main/java/ctbrec/recorder/LocalRecorder.java
+++ b/common/src/main/java/ctbrec/recorder/LocalRecorder.java
@@ -263,7 +263,7 @@ public class LocalRecorder implements Recorder {
     }
 
     @Override
-    public boolean isRecording(Model model) {
+    public boolean isTracked(Model model) {
         lock.lock();
         try {
             return models.contains(model);
@@ -345,7 +345,7 @@ public class LocalRecorder implements Recorder {
         }
 
         try {
-            boolean modelInRecordingList = isRecording(model);
+            boolean modelInRecordingList = isTracked(model);
             boolean online = model.isOnline(IGNORE_CACHE);
             if (modelInRecordingList && online) {
                 LOG.info("Restarting recording for model {}", model);
diff --git a/common/src/main/java/ctbrec/recorder/Recorder.java b/common/src/main/java/ctbrec/recorder/Recorder.java
index 18e42537..48a1d400 100644
--- a/common/src/main/java/ctbrec/recorder/Recorder.java
+++ b/common/src/main/java/ctbrec/recorder/Recorder.java
@@ -20,7 +20,7 @@ public interface Recorder {
      * Returns true, if a model is in the list of models to record. This does not reflect, if there currently is a recording running. The model might be offline
      * aswell.
      */
-    public boolean isRecording(Model model);
+    public boolean isTracked(Model model);
 
     /**
      * Get the list of all models, which are tracked by ctbrec
diff --git a/common/src/main/java/ctbrec/recorder/RemoteRecorder.java b/common/src/main/java/ctbrec/recorder/RemoteRecorder.java
index 442c535d..5662a5e1 100644
--- a/common/src/main/java/ctbrec/recorder/RemoteRecorder.java
+++ b/common/src/main/java/ctbrec/recorder/RemoteRecorder.java
@@ -122,7 +122,7 @@ public class RemoteRecorder implements Recorder {
     }
 
     @Override
-    public boolean isRecording(Model model) {
+    public boolean isTracked(Model model) {
         return models != null && models.contains(model);
     }