diff --git a/BoardConfig.mk b/BoardConfig.mk
index eaa0bf6..f9ec39e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -139,6 +139,7 @@ TARGET_POWERHAL_VARIANT := qcom
 BOARD_USES_QCOM_HARDWARE := true
 
 # Recovery
+TARGET_OTA_ASSERT_DEVICE := crackling,vixen
 TARGET_RECOVERY_FSTAB := $(LOCAL_PATH)/rootdir/etc/fstab.qcom
 TARGET_USERIMAGES_USE_EXT4 := true
 
diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index 7658a1f..e327e4b 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -17,7 +17,7 @@
 #ifndef _BDROID_BUILDCFG_H
 #define _BDROID_BUILDCFG_H
 
-#define BTM_DEF_LOCAL_NAME   "WileyFox Vixen"
+#define BTM_DEF_LOCAL_NAME   "Wileyfox Swift"
 #define BLUETOOTH_QTI_SW TRUE
 #define MAX_ACL_CONNECTIONS    7
 #define MAX_L2CAP_CHANNELS    16
diff --git a/cm.mk b/cm.mk
index 77bc856..fc0c339 100644
--- a/cm.mk
+++ b/cm.mk
@@ -21,10 +21,10 @@ PRODUCT_NAME := cm_crackling
 BOARD_VENDOR := wileyfox
 PRODUCT_DEVICE := crackling
 
-PRODUCT_MANUFACTURER := wileyfox
-PRODUCT_MODEL := Vixen
+PRODUCT_MANUFACTURER := Wileyfox
+PRODUCT_MODEL := Wileyfox Swift
 
-PRODUCT_BRAND := WileyFox
+PRODUCT_BRAND := Wileyfox
 TARGET_VENDOR := wileyfox
-TARGET_VENDOR_PRODUCT_NAME := crackling
-TARGET_VENDOR_DEVICE_NAME := vixen
+TARGET_VENDOR_PRODUCT_NAME := Swift
+TARGET_VENDOR_DEVICE_NAME := crackling