diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AppManagerActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AppManagerActivity.java
index cabc7c2b..8640c881 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AppManagerActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/AppManagerActivity.java
@@ -26,7 +26,7 @@ import nodomain.freeyourgadget.gadgetbridge.adapter.GBDeviceAppAdapter;
 
 public class AppManagerActivity extends Activity {
     public static final String ACTION_REFRESH_APPLIST
-            = "nodomain.freeyourgadget.gadgetbride.appmanager.action.refresh_applist";
+            = "nodomain.freeyourgadget.gadgetbridge.appmanager.action.refresh_applist";
     private static final Logger LOG = LoggerFactory.getLogger(AppManagerActivity.class);
 
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
index e8dde1bb..742c6331 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
@@ -30,38 +30,38 @@ import nodomain.freeyourgadget.gadgetbridge.pebble.PebbleSupport;
 
 public class BluetoothCommunicationService extends Service {
     public static final String ACTION_START
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.start";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.start";
     public static final String ACTION_CONNECT
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.connect";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.connect";
     public static final String ACTION_NOTIFICATION_GENERIC
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.notification_generic";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.notification_generic";
     public static final String ACTION_NOTIFICATION_SMS
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.notification_sms";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.notification_sms";
     public static final String ACTION_NOTIFICATION_EMAIL
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.notification_email";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.notification_email";
     public static final String ACTION_CALLSTATE
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.callstate";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.callstate";
     public static final String ACTION_SETTIME
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.settime";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.settime";
     public static final String ACTION_SETMUSICINFO
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.setmusicinfo";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.setmusicinfo";
     public static final String ACTION_REQUEST_VERSIONINFO
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.request_versioninfo";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.request_versioninfo";
     public static final String ACTION_REQUEST_APPINFO
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.request_appinfo";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.request_appinfo";
     public static final String ACTION_REQUEST_SCREENSHOT
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.request_screenshot";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.request_screenshot";
     public static final String ACTION_STARTAPP
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.startapp";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.startapp";
     public static final String ACTION_DELETEAPP
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.deleteapp";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.deleteapp";
     public static final String ACTION_INSTALL_PEBBLEAPP
-            = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.install_pebbbleapp";
-    public static final String ACTION_REBOOT = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.reboot";
-    public static final String ACTION_FETCH_ACTIVITY_DATA = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.fetch_activity_data";
-    public static final String ACTION_DISCONNECT = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.disconnect";
-    public static final String ACTION_FIND_DEVICE = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.find_device";
-    public static final String ACTION_SET_ALARMS = "nodomain.freeyourgadget.gadgetbride.bluetoothcommunicationservice.action.set_alarms";
+            = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.install_pebbbleapp";
+    public static final String ACTION_REBOOT = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.reboot";
+    public static final String ACTION_FETCH_ACTIVITY_DATA = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.fetch_activity_data";
+    public static final String ACTION_DISCONNECT = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.disconnect";
+    public static final String ACTION_FIND_DEVICE = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.find_device";
+    public static final String ACTION_SET_ALARMS = "nodomain.freeyourgadget.gadgetbridge.bluetoothcommunicationservice.action.set_alarms";
 
     public static final String EXTRA_PERFORM_PAIR = "perform_pair";
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java
index 13ba24ca..a88f1357 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/ControlCenter.java
@@ -40,10 +40,10 @@ public class ControlCenter extends Activity {
     private static final Logger LOG = LoggerFactory.getLogger(ControlCenter.class);
 
     public static final String ACTION_QUIT
-            = "nodomain.freeyourgadget.gadgetbride.controlcenter.action.quit";
+            = "nodomain.freeyourgadget.gadgetbridge.controlcenter.action.quit";
 
     public static final String ACTION_REFRESH_DEVICELIST
-            = "nodomain.freeyourgadget.gadgetbride.controlcenter.action.set_version";
+            = "nodomain.freeyourgadget.gadgetbridge.controlcenter.action.set_version";
 
     TextView hintTextView;
     ListView deviceListView;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java
index 8358abca..015bc94d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBDevice.java
@@ -11,7 +11,7 @@ import org.slf4j.LoggerFactory;
 
 public class GBDevice implements Parcelable {
     public static final String ACTION_DEVICE_CHANGED
-            = "nodomain.freeyourgadget.gadgetbride.gbdevice.action.device_changed";
+            = "nodomain.freeyourgadget.gadgetbridge.gbdevice.action.device_changed";
     public static final Creator<GBDevice> CREATOR = new Creator<GBDevice>() {
         @Override
         public GBDevice createFromParcel(Parcel source) {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractChartFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractChartFragment.java
index b004cccd..351fa573 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractChartFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/AbstractChartFragment.java
@@ -30,7 +30,7 @@ public abstract class AbstractChartFragment extends Fragment {
     private static final Logger LOG = LoggerFactory.getLogger(ActivitySleepChartFragment.class);
 
     public static final String ACTION_REFRESH
-            = "nodomain.freeyourgadget.gadgetbride.chart.action.refresh";
+            = "nodomain.freeyourgadget.gadgetbridge.chart.action.refresh";
 
 
     protected static final class ActivityKind {
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/GadgetbridgePblSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/GadgetbridgePblSupport.java
index 9720bd4a..0fc11ef4 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/GadgetbridgePblSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/pebble/GadgetbridgePblSupport.java
@@ -36,7 +36,7 @@ public class GadgetbridgePblSupport {
                     break;
                 case KEY_SAMPLES:
                     byte[] samples = (byte[]) pair.second;
-                    LOG.info("got " + samples.length + " samples");
+                    LOG.info("got " + samples.length/2  + " samples");
                     ByteBuffer samplesBuffer = ByteBuffer.wrap(samples);
                     // TODO: read samples and put into database
                     break;