diff --git a/app/src/main/java/com/wei/amazingtalker/ui/AtAppState.kt b/app/src/main/java/com/wei/amazingtalker/ui/AtAppState.kt
index 6dd4bf56..e7fcca42 100644
--- a/app/src/main/java/com/wei/amazingtalker/ui/AtAppState.kt
+++ b/app/src/main/java/com/wei/amazingtalker/ui/AtAppState.kt
@@ -186,7 +186,7 @@ class AtAppState(
      * Map of top level destinations to be used in the TopBar, BottomBar and NavRail. The key is the
      * route.
      */
-    val topLevelDestinations: List<TopLevelDestination> = TopLevelDestination.values().asList()
+    val topLevelDestinations: List<TopLevelDestination> = TopLevelDestination.entries
 
     /**
      * UI logic for navigating to a top level destination in the app. Top level destinations have
diff --git a/core/domain/src/test/java/com/wei/amazingtalker/core/domain/IntervalizeScheduleUseCaseTest.kt b/core/domain/src/test/java/com/wei/amazingtalker/core/domain/IntervalizeScheduleUseCaseTest.kt
index 816ed6aa..5da95fab 100644
--- a/core/domain/src/test/java/com/wei/amazingtalker/core/domain/IntervalizeScheduleUseCaseTest.kt
+++ b/core/domain/src/test/java/com/wei/amazingtalker/core/domain/IntervalizeScheduleUseCaseTest.kt
@@ -27,7 +27,7 @@ class IntervalizeScheduleUseCaseTest(
         @JvmStatic
         @Parameterized.Parameters(name = "{0}")
         fun data(): Collection<Array<TimeInterval>> {
-            return TimeInterval.values().map { arrayOf(it) }
+            return TimeInterval.entries.map { arrayOf(it) }
         }
     }
 
diff --git a/core/testing/src/main/java/com/wei/amazingtalker/core/testing/util/ScreenshotHelper.kt b/core/testing/src/main/java/com/wei/amazingtalker/core/testing/util/ScreenshotHelper.kt
index 373abb1d..9b405a8f 100644
--- a/core/testing/src/main/java/com/wei/amazingtalker/core/testing/util/ScreenshotHelper.kt
+++ b/core/testing/src/main/java/com/wei/amazingtalker/core/testing/util/ScreenshotHelper.kt
@@ -38,7 +38,7 @@ fun <A : ComponentActivity> AndroidComposeTestRule<ActivityScenarioRule<A>, A>.c
     screenshotName: String,
     body: @Composable () -> Unit,
 ) {
-    DefaultTestDevices.values().forEach {
+    DefaultTestDevices.entries.forEach {
         this.captureForDevice(it.description, it.spec, screenshotName, body = body)
     }
 }