diff --git a/InfiniTime b/InfiniTime
index 2105a7b..fcc8073 160000
--- a/InfiniTime
+++ b/InfiniTime
@@ -1 +1 @@
-Subproject commit 2105a7b63da8d4065ebfc62e0057f225358eedfc
+Subproject commit fcc8073fabe9ef095aa3597eed678e7eeb04086a
diff --git a/main.cpp b/main.cpp
index f807107..cfd3d2f 100644
--- a/main.cpp
+++ b/main.cpp
@@ -779,7 +779,7 @@ class Framework {
         }
       } else if (key == 'h') {
         if (heartRateController.State() == Pinetime::Controllers::HeartRateController::States::Stopped) {
-          heartRateController.Start();
+          heartRateController.Enable();
         } else if (heartRateController.State() == Pinetime::Controllers::HeartRateController::States::NotEnoughData) {
           heartRateController.Update(Pinetime::Controllers::HeartRateController::States::Running, 10);
         } else {
@@ -787,7 +787,7 @@ class Framework {
           heartRateController.Update(Pinetime::Controllers::HeartRateController::States::Running, heartrate + 10);
         }
       } else if (key == 'H') {
-        heartRateController.Stop();
+        heartRateController.Disable();
       } else if (key == 'i') {
         saveScreenshot();
       } else if (key == 'I') {
diff --git a/sim/components/heartrate/HeartRateController.cpp b/sim/components/heartrate/HeartRateController.cpp
index c7d0397..4d407a8 100644
--- a/sim/components/heartrate/HeartRateController.cpp
+++ b/sim/components/heartrate/HeartRateController.cpp
@@ -12,17 +12,17 @@ void HeartRateController::Update(HeartRateController::States newState, uint8_t h
   }
 }
 
-void HeartRateController::Start() {
+void HeartRateController::Enable() {
   if (task != nullptr) {
     state = States::NotEnoughData;
-    task->PushMessage(Pinetime::Applications::HeartRateTask::Messages::StartMeasurement);
+    task->PushMessage(Pinetime::Applications::HeartRateTask::Messages::Enable);
   }
 }
 
-void HeartRateController::Stop() {
+void HeartRateController::Disable() {
   if (task != nullptr) {
     state = States::Stopped;
-    task->PushMessage(Pinetime::Applications::HeartRateTask::Messages::StopMeasurement);
+    task->PushMessage(Pinetime::Applications::HeartRateTask::Messages::Disable);
   }
 }
 
diff --git a/sim/components/heartrate/HeartRateController.h b/sim/components/heartrate/HeartRateController.h
index 89feefc..f1dcd8b 100644
--- a/sim/components/heartrate/HeartRateController.h
+++ b/sim/components/heartrate/HeartRateController.h
@@ -16,8 +16,8 @@ namespace Pinetime {
       enum class States { Stopped, NotEnoughData, NoTouch, Running };
 
       HeartRateController() = default;
-      void Start();
-      void Stop();
+      void Enable();
+      void Disable();
       void Update(States newState, uint8_t heartRate);
 
       void SetHeartRateTask(Applications::HeartRateTask* task);
@@ -37,4 +37,4 @@ namespace Pinetime {
       //Pinetime::Controllers::HeartRateService* service = nullptr;
     };
   }
-}
\ No newline at end of file
+}
diff --git a/sim/heartratetask/HeartRateTask.h b/sim/heartratetask/HeartRateTask.h
index c67694d..8cd449a 100644
--- a/sim/heartratetask/HeartRateTask.h
+++ b/sim/heartratetask/HeartRateTask.h
@@ -14,8 +14,7 @@ namespace Pinetime {
   namespace Applications {
     class HeartRateTask {
     public:
-      enum class Messages : uint8_t { GoToSleep, WakeUp, StartMeasurement, StopMeasurement };
-      enum class States { Idle, Running };
+      enum class Messages : uint8_t { GoToSleep, WakeUp, Enable, Disable };
 
       explicit HeartRateTask(Drivers::Hrs3300& heartRateSensor, Controllers::HeartRateController& controller);
       void Start();
@@ -23,13 +22,14 @@ namespace Pinetime {
       void PushMessage(Messages msg);
 
     private:
+      enum class States : uint8_t { Disabled, Waiting, BackgroundMeasuring, ForegroundMeasuring };
       //static void Process(void* instance);
       //void StartMeasurement();
       //void StopMeasurement();
 
 //      TaskHandle_t taskHandle;
       QueueHandle_t messageQueue;
-      States state = States::Running;
+      States state = States::Disabled;
       Drivers::Hrs3300& heartRateSensor;
       Controllers::HeartRateController& controller;
 //      Controllers::Ppg ppg;