diff --git a/src/main/scala/com/harana/search/client/settings/indexing/IndexingHandler.scala b/src/main/scala/com/harana/search/client/settings/indexing/IndexingHandler.scala
index 2362e48..c2fc24d 100644
--- a/src/main/scala/com/harana/search/client/settings/indexing/IndexingHandler.scala
+++ b/src/main/scala/com/harana/search/client/settings/indexing/IndexingHandler.scala
@@ -18,7 +18,7 @@ class IndexingHandler extends ActionHandler(zoomTo(_.indexingState)) {
         Tauri.setting("indexer_pause_cpu_maximum_temperature_enabled", value => UpdatePauseCpuMaximumTemperatureEnabled(value.toBoolean)) +
         Tauri.setting("indexer_pause_cpu_maximum_temperature_value", value => UpdatePauseCpuMaximumTemperatureValue(value.toInt)) +
         Tauri.setting("indexer_pause_cpu_maximum_usage_enabled", value => UpdatePauseCpuMaximumTemperatureEnabled(value.toBoolean)) +
-        Tauri.setting("indexer_pause_cpu_maximum_usage_value", value => UpdatePauseCpuMaximumUtilisationValue(value.toInt)) +
+        Tauri.setting("indexer_pause_cpu_maximum_usage_value", value => UpdatePauseCpuMaximumUsageValue(value.toInt)) +
         Tauri.setting("indexer_pause_hours_between_enabled", value => UpdatePauseHoursBetweenEnabled(value.toBoolean)) +
         Tauri.setting("indexer_pause_hours_between_start", value => UpdatePauseHoursBetweenStart(value.toInt)) +
         Tauri.setting("indexer_pause_hours_between_end", value => UpdatePauseHoursBetweenEnd(value.toInt))
@@ -55,14 +55,14 @@ class IndexingHandler extends ActionHandler(zoomTo(_.indexingState)) {
         effect => updated(value.copy(pauseCpuMaximumTemperatureValue = newValue), effect)
       )
 
-    case UpdatePauseCpuMaximumUtilisationEnabled(enabled) =>
+    case UpdatePauseCpuMaximumUsageEnabled(enabled) =>
       Tauri.update_setting("indexer_pause_cpu_maximum_usage_enabled", enabled.toString,
-        effect => updated(value.copy(pauseCpuMaximumUtilisationEnabled = enabled), effect)
+        effect => updated(value.copy(pauseCpuMaximumUsageEnabled = enabled), effect)
       )
 
-    case UpdatePauseCpuMaximumUtilisationValue(newValue) =>
+    case UpdatePauseCpuMaximumUsageValue(newValue) =>
       Tauri.update_setting("indexer_pause_cpu_maximum_usage_value", newValue.toString,
-        effect => updated(value.copy(pauseCpuMaximumUtilisationValue = newValue), effect)
+        effect => updated(value.copy(pauseCpuMaximumUsageValue = newValue), effect)
       )
 
     case UpdatePauseHoursBetweenEnabled(enabled) =>
diff --git a/src/main/scala/com/harana/search/client/settings/indexing/IndexingStore.scala b/src/main/scala/com/harana/search/client/settings/indexing/IndexingStore.scala
index 813b15d..40ea48d 100644
--- a/src/main/scala/com/harana/search/client/settings/indexing/IndexingStore.scala
+++ b/src/main/scala/com/harana/search/client/settings/indexing/IndexingStore.scala
@@ -12,8 +12,8 @@ object IndexingStore {
                    pauseBatteryLifeRemainingValue: Int,
                    pauseCpuMaximumTemperatureEnabled: Boolean,
                    pauseCpuMaximumTemperatureValue: Int,
-                   pauseCpuMaximumUtilisationEnabled: Boolean,
-                   pauseCpuMaximumUtilisationValue: Int,
+                   pauseCpuMaximumUsageEnabled: Boolean,
+                   pauseCpuMaximumUsageValue: Int,
                    pauseHoursBetweenEnabled: Boolean,
                    pauseHoursBetweenStart: Int,
                    pauseHoursBetweenEnd: Int)
@@ -31,8 +31,8 @@ object IndexingStore {
   case class UpdatePauseCpuMaximumTemperatureEnabled(enabled: Boolean) extends DiodeAction
   case class UpdatePauseCpuMaximumTemperatureValue(value: Int) extends DiodeAction
 
-  case class UpdatePauseCpuMaximumUtilisationEnabled(enabled: Boolean) extends DiodeAction
-  case class UpdatePauseCpuMaximumUtilisationValue(value: Int) extends DiodeAction
+  case class UpdatePauseCpuMaximumUsageEnabled(enabled: Boolean) extends DiodeAction
+  case class UpdatePauseCpuMaximumUsageValue(value: Int) extends DiodeAction
 
   case class UpdatePauseHoursBetweenEnabled(enabled: Boolean) extends DiodeAction
   case class UpdatePauseHoursBetweenStart(value: Int) extends DiodeAction
diff --git a/src/main/scala/com/harana/search/client/settings/indexing/ui/IndexingPanel.scala b/src/main/scala/com/harana/search/client/settings/indexing/ui/IndexingPanel.scala
index 988be2d..069e3e3 100644
--- a/src/main/scala/com/harana/search/client/settings/indexing/ui/IndexingPanel.scala
+++ b/src/main/scala/com/harana/search/client/settings/indexing/ui/IndexingPanel.scala
@@ -64,8 +64,8 @@ import scala.scalajs.js.|
                       div(className := "whitespace-nowrap pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-4")(
                         Switch("pause_cpu_temperatures",
                           label = Some("CPU Temperature greater than"),
-                          state.pauseCpuTemperatureEnabled,
-                          _ => Circuit.dispatch(UpdatePauseCpuTemperatureEnabled(!state.pauseCpuTemperatureEnabled))
+                          state.pauseCpuMaximumTemperatureEnabled,
+                          _ => Circuit.dispatch(UpdatePauseCpuMaximumTemperatureEnabled(!state.pauseCpuMaximumTemperatureEnabled))
                         ),
                       )
                     ),
@@ -73,7 +73,7 @@ import scala.scalajs.js.|
                       div(className := "whitespace-nowrap px-1 pr-3 text-sm text-gray-500")(
                         Listbox(
                           "cpu_temperatures_list",
-                          selectedItem = state.pauseCpuTemperatureValue,
+                          selectedItem = state.pauseCpuMaximumTemperatureValue,
                           items = (10 to 120).toList,
                           itemId = item => item.toString,
                           itemTitle = item => s"${item.toString}C",
@@ -86,18 +86,18 @@ import scala.scalajs.js.|
                   tr(
                     td(colSpan := 3, className := "py-2")(
                       div(className := "whitespace-nowrap pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-4")(
-                        Switch("pause_cpu_utilisation",
-                          label = Some("CPU Utilisation greater than"),
-                          state.pauseCpuUtilisationEnabled,
-                          _ => Circuit.dispatch(UpdatePauseCpuUtilisationEnabled(!state.pauseCpuUtilisationEnabled))
+                        Switch("pause_cpu_usage",
+                          label = Some("CPU Usage greater than"),
+                          state.pauseCpuMaximumUsageEnabled,
+                          _ => Circuit.dispatch(UpdatePauseCpuMaximumUsageEnabled(!state.pauseCpuMaximumUsageEnabled))
                         ),
                       )
                     ),
                     td(className := "py-2")(
                       div(className := "whitespace-nowrap px-1 pr-3 text-sm text-gray-500")(
                         Listbox(
-                          "cpu_utilisations_list",
-                          selectedItem = state.pauseCpuUtilisationValue,
+                          "cpu_usage_list",
+                          selectedItem = state.pauseCpuMaximumUsageValue,
                           items = (0 to 100).toList,
                           itemId = item => item.toString,
                           itemTitle = item => s"${item.toString}%",