diff --git a/BoardConfig.mk b/BoardConfig.mk
index a4a0be5..72de35b 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -1,5 +1,6 @@
 #
 # Copyright (C) 2016 The CyanogenMod Project
+# Copyright (C) 2017 The LineageOS Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -45,7 +46,7 @@ BOARD_MKBOOTIMG_ARGS := --ramdisk_offset 0x01000000 --tags_offset 0x00000100
 BOARD_KERNEL_IMAGE_NAME := zImage-dtb
 TARGET_KERNEL_APPEND_DTB := true
 TARGET_KERNEL_ARCH := arm
-TARGET_KERNEL_CONFIG := onyx_defconfig
+TARGET_KERNEL_CONFIG := lineageos_onyx_defconfig
 TARGET_KERNEL_SOURCE := kernel/oneplus/onyx
 
 # ANT+
diff --git a/device.mk b/device.mk
index 0ac84ce..0dd64cb 100644
--- a/device.mk
+++ b/device.mk
@@ -215,6 +215,10 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     com.android.future.usb.accessory
 
+# Weather providers
+PRODUCT_PACKAGES += \
+    OpenWeatherMapWeatherProvider
+
 # WiFi
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \
diff --git a/cm.dependencies b/lineage.dependencies
similarity index 100%
rename from cm.dependencies
rename to lineage.dependencies
diff --git a/cm.mk b/lineage.mk
similarity index 94%
rename from cm.mk
rename to lineage.mk
index 4a6a246..46dde29 100644
--- a/cm.mk
+++ b/lineage.mk
@@ -18,13 +18,13 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from onyx device
 $(call inherit-product, device/oneplus/onyx/device.mk)
 
-# Inherit some common CM stuff.
+# Inherit some common Lineage stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
 # Call the proprietary setup
 $(call inherit-product-if-exists, vendor/oneplus/onyx/onyx-vendor.mk)
 
-PRODUCT_NAME := cm_onyx
+PRODUCT_NAME := lineage_onyx
 PRODUCT_DEVICE := onyx
 PRODUCT_MANUFACTURER := OnePlus
 
diff --git a/vendorsetup.sh b/vendorsetup.sh
index f09eb01..57db6a7 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -1,3 +1,3 @@
-add_lunch_combo cm_onyx-user
-add_lunch_combo cm_onyx-userdebug
-add_lunch_combo cm_onyx-eng
+add_lunch_combo lineage_onyx-user
+add_lunch_combo lineage_onyx-userdebug
+add_lunch_combo lineage_onyx-eng