diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
index c5d05183..b964773a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java
@@ -53,7 +53,7 @@ public class DebugActivity extends Activity {
     private Button setMusicInfoButton;
     private Button setTimeButton;
     private Button rebootButton;
-    private Button HearRateButton;
+    private Button HeartRateButton;
     private Button exportDBButton;
     private Button importDBButton;
     private Button deleteDBButton;
@@ -186,11 +186,12 @@ public class DebugActivity extends Activity {
                 GBApplication.deviceService().onReboot();
             }
         });
-        HearRateButton = (Button) findViewById(R.id.HearRateButton);
-        HearRateButton.setOnClickListener(new View.OnClickListener() {
+        HeartRateButton = (Button) findViewById(R.id.HearRateButton);
+        HeartRateButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                GBApplication.deviceService().onHearRateTest();
+                GB.toast("Measuring heart rate, please wait...", Toast.LENGTH_SHORT, GB.INFO);
+                GBApplication.deviceService().onHeartRateTest();
             }
         });
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
index 1136f084..0d3de370 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/EventHandler.java
@@ -40,7 +40,7 @@ public interface EventHandler {
 
     void onReboot();
 
-    void onHearRateTest();
+    void onHeartRateTest();
 
     void onFindDevice(boolean start);
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
index 54cc6c23..027a54c3 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java
@@ -172,7 +172,7 @@ public class GBDeviceService implements DeviceService {
     }
 
     @Override
-    public void onHearRateTest() {
+    public void onHeartRateTest() {
         Intent intent = createIntent().setAction(ACTION_HEARTRATE_TEST);
         invokeService(intent);
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
index 15e6f1c6..bae6f8b9 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
@@ -253,7 +253,7 @@ public class DeviceCommunicationService extends Service {
                 break;
             }
             case ACTION_HEARTRATE_TEST: {
-                mDeviceSupport.onHearRateTest();
+                mDeviceSupport.onHeartRateTest();
                 break;
             }
             case ACTION_FETCH_ACTIVITY_DATA: {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
index 8faf48a9..4ddeff3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/ServiceDeviceSupport.java
@@ -195,11 +195,11 @@ public class ServiceDeviceSupport implements DeviceSupport {
     }
 
     @Override
-    public void onHearRateTest() {
+    public void onHeartRateTest() {
         if (checkBusy("heartrate")) {
             return;
         }
-        delegate.onHearRateTest();
+        delegate.onHeartRateTest();
     }
 
     @Override
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
index f35d983e..63c3c022 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/miband/MiBandSupport.java
@@ -534,7 +534,7 @@ public class MiBandSupport extends AbstractBTLEDeviceSupport {
     }
 
     @Override
-    public void onHearRateTest() {
+    public void onHeartRateTest() {
         if (supportsHeartRate()) {
             try {
                 TransactionBuilder builder = performInitialized("HeartRateTest");
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java
index d045789c..0f0b3399 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleSupport.java
@@ -38,7 +38,7 @@ public class PebbleSupport extends AbstractSerialDeviceSupport {
     }
 
     @Override
-    public void onHearRateTest() {
+    public void onHeartRateTest() {
 
     }
 
diff --git a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/TestDeviceSupport.java b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/TestDeviceSupport.java
index a3a8ff1f..510095e5 100644
--- a/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/TestDeviceSupport.java
+++ b/app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/TestDeviceSupport.java
@@ -102,7 +102,7 @@ public class TestDeviceSupport extends AbstractDeviceSupport {
     }
 
     @Override
-    public void onHearRateTest() {
+    public void onHeartRateTest() {
 
     }