diff --git a/app/src/main/java/be/ugent/sel/studeez/data/SelectedTimerRepo.kt b/app/src/main/java/be/ugent/sel/studeez/data/SelectedTimerState.kt
similarity index 89%
rename from app/src/main/java/be/ugent/sel/studeez/data/SelectedTimerRepo.kt
rename to app/src/main/java/be/ugent/sel/studeez/data/SelectedTimerState.kt
index 9fcd487..f8fcebd 100644
--- a/app/src/main/java/be/ugent/sel/studeez/data/SelectedTimerRepo.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/data/SelectedTimerState.kt
@@ -9,6 +9,6 @@ import javax.inject.Singleton
  * Because this is a singleton-class the view-models of both screens observe the same data.
  */
 @Singleton
-class SelectedTimerRepo @Inject constructor(){
+class SelectedTimerState @Inject constructor(){
     var selectedTimer: FunctionalTimer? = null
 }
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionViewModel.kt b/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionViewModel.kt
index 8d36a50..f4bf93c 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionViewModel.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionViewModel.kt
@@ -3,17 +3,17 @@ package be.ugent.sel.studeez.screens.session
 import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalTimer
 import be.ugent.sel.studeez.domain.LogService
 import be.ugent.sel.studeez.screens.StudeezViewModel
-import be.ugent.sel.studeez.data.SelectedTimerRepo
+import be.ugent.sel.studeez.data.SelectedTimerState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
 @HiltViewModel
 class SessionViewModel @Inject constructor(
-    private val selectedTimerRepo: SelectedTimerRepo,
+    private val selectedTimerState: SelectedTimerState,
     logService: LogService
 ) : StudeezViewModel(logService) {
 
     fun getTimer() : FunctionalTimer {
-        return selectedTimerRepo.selectedTimer!!
+        return selectedTimerState.selectedTimer!!
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_selection/TimerSelectionViewModel.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_selection/TimerSelectionViewModel.kt
index cae25e3..c555bfa 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_selection/TimerSelectionViewModel.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_selection/TimerSelectionViewModel.kt
@@ -1,6 +1,6 @@
 package be.ugent.sel.studeez.screens.timer_selection
 
-import be.ugent.sel.studeez.data.SelectedTimerRepo
+import be.ugent.sel.studeez.data.SelectedTimerState
 import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo
 import be.ugent.sel.studeez.domain.LogService
 import be.ugent.sel.studeez.domain.TimerDAO
@@ -13,7 +13,7 @@ import javax.inject.Inject
 @HiltViewModel
 class TimerSelectionViewModel @Inject constructor(
     private val timerDAO: TimerDAO,
-    private val selectedTimerRepo: SelectedTimerRepo,
+    private val selectedTimerState: SelectedTimerState,
     logService: LogService
 ) : StudeezViewModel(logService) {
 
@@ -22,7 +22,7 @@ class TimerSelectionViewModel @Inject constructor(
     }
 
     fun startSession(open: (String) -> Unit, timerInfo: TimerInfo) {
-        selectedTimerRepo.selectedTimer = timerInfo.getFunctionalTimer()
+        selectedTimerState.selectedTimer = timerInfo.getFunctionalTimer()
         open(StudeezDestinations.SESSION_SCREEN)
     }
 }
\ No newline at end of file