diff --git a/internal/pkg/model/types.go b/internal/pkg/model/types.go
index 2bd2ffe..9e6fd6a 100644
--- a/internal/pkg/model/types.go
+++ b/internal/pkg/model/types.go
@@ -33,7 +33,7 @@ type Incoming_json struct {
 	Instance_id      string `json:"instance_id"`
 	// button stuff
 	HB_ButtonCounter      int64  `json:"hb_button_counter"`
-	HB_ButtonCounter_Prev int64  `json:"hb_button_counter"`
+	HB_ButtonCounter_Prev int64  `json:"hb_button_counter_prev"`
 	HB_Battery            int64  `json:"hb_button_battery"`
 	HB_RandomNonce        string `json:"hb_button_random"`
 	HB_ButtonMode         string `json:"hb_button_mode"`
@@ -122,7 +122,7 @@ type Beacon struct {
 	Beacon_metrics              []BeaconMetric
 
 	HB_ButtonCounter      int64  `json:"hb_button_counter"`
-	HB_ButtonCounter_Prev int64  `json:"hb_button_counter"`
+	HB_ButtonCounter_Prev int64  `json:"hb_button_counter_prev"`
 	HB_Battery            int64  `json:"hb_button_battery"`
 	HB_RandomNonce        string `json:"hb_button_random"`
 	HB_ButtonMode         string `json:"hb_button_mode"`
diff --git a/test/mqtt_test/mqtt_test.go b/test/mqtt_test/mqtt_test.go
index d9790c5..851a111 100644
--- a/test/mqtt_test/mqtt_test.go
+++ b/test/mqtt_test/mqtt_test.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/AFASystems/presence/internal/pkg/model"
-	"github.com/AFASystems/presence/internal/pkg/mqtt"
+	"github.com/AFASystems/presence/internal/pkg/mqtt_client"
 	"github.com/AFASystems/presence/internal/pkg/persistence"
 	"github.com/boltdb/bolt"
 )
@@ -29,9 +29,9 @@ func TestIncomingMQTTProcessor(t *testing.T) {
 	}
 	model.Db = db
 
-	persistence.LoadInitialState(ctx)
+	persistence.LoadState(model.Db, ctx)
 
-	ch := mqtt.IncomingMQTTProcessor(20*time.Millisecond, nil, model.Db, ctx)
+	ch := mqtt_client.IncomingMQTTProcessor(20*time.Millisecond, nil, model.Db, ctx)
 	msg := model.Incoming_json{MAC: "15:02:31", Hostname: "testHost", RSSI: -55}
 	ch <- msg