diff --git a/build/core/config.mk b/build/core/config.mk
index 026b458..19e2521 100644
--- a/build/core/config.mk
+++ b/build/core/config.mk
@@ -18,9 +18,9 @@
 INTERNAL_CM_PLATFORM_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/cm_removed.txt
 FRAMEWORK_CM_PLATFORM_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_current.txt
 FRAMEWORK_CM_PLATFORM_REMOVED_API_FILE := $(TOPDIR)vendor/cmsdk/api/cm_removed.txt
-FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/cm/build/core/apicheck_msg_current.txt
+FRAMEWORK_CM_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/lineage/build/core/apicheck_msg_current.txt
 
-BUILD_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact.mk
-PUBLISH_MAVEN_PREBUILT := $(TOP)/vendor/cm/build/core/maven_artifact_publish.mk
+BUILD_MAVEN_PREBUILT := $(TOP)/vendor/lineage/build/core/maven_artifact.mk
+PUBLISH_MAVEN_PREBUILT := $(TOP)/vendor/lineage/build/core/maven_artifact_publish.mk
 
-BUILD_HTTP_PREBUILT := $(TOP)/vendor/cm/build/core/http_prebuilt.mk
+BUILD_HTTP_PREBUILT := $(TOP)/vendor/lineage/build/core/http_prebuilt.mk
diff --git a/build/core/http_prebuilt.mk b/build/core/http_prebuilt.mk
index 4d7556a..592df5c 100644
--- a/build/core/http_prebuilt.mk
+++ b/build/core/http_prebuilt.mk
@@ -25,7 +25,7 @@
   $(error LOCAL_HTTP_MD5SUM not defined.)
 endif
 
-PREBUILT_MODULE_ARCHIVE := vendor/cm/prebuilt/archive/$(LOCAL_MODULE)
+PREBUILT_MODULE_ARCHIVE := vendor/lineage/prebuilt/archive/$(LOCAL_MODULE)
 
 PREBUILT_MODULE_FILE := $(PREBUILT_MODULE_ARCHIVE)/$(LOCAL_HTTP_FILENAME)
 
@@ -64,7 +64,7 @@
 # $(1) url
 # $(2) file output
 define download-prebuilt-module
-  ./vendor/cm/build/tasks/http_curl_prebuilt.sh $(1) $(2);
+  ./vendor/lineage/build/tasks/http_curl_prebuilt.sh $(1) $(2);
 endef
 
 define cleanup
diff --git a/build/core/mtk_target.mk b/build/core/mtk_target.mk
index 6dfeb6e..11a7f8c 100644
--- a/build/core/mtk_target.mk
+++ b/build/core/mtk_target.mk
@@ -1,5 +1,5 @@
 # Bring in Mediatek helper macros
-include vendor/cm/build/core/mtk_utils.mk
+include vendor/lineage/build/core/mtk_utils.mk
 
 ifeq ($(BOARD_USES_MTK_HARDWARE),true)
     mtk_flags := -DMTK_HARDWARE
diff --git a/build/core/qcom_target.mk b/build/core/qcom_target.mk
index e36958a..9bbe252 100644
--- a/build/core/qcom_target.mk
+++ b/build/core/qcom_target.mk
@@ -1,7 +1,7 @@
 # Target-specific configuration
 
 # Bring in Qualcomm helper macros
-include vendor/cm/build/core/qcom_utils.mk
+include vendor/lineage/build/core/qcom_utils.mk
 
 # Populate the qcom hardware variants in the project pathmap.
 define ril-set-path-variant
diff --git a/build/envsetup.sh b/build/envsetup.sh
index d13fa39..2f7568d 100644
--- a/build/envsetup.sh
+++ b/build/envsetup.sh
@@ -43,7 +43,7 @@
     CM_DEVICES_ONLY="true"
     unset LUNCH_MENU_CHOICES
     add_lunch_combo full-eng
-    for f in `/bin/ls vendor/cm/vendorsetup.sh 2> /dev/null`
+    for f in `/bin/ls vendor/lineage/vendorsetup.sh 2> /dev/null`
         do
             echo "including $f"
             . $f
@@ -925,7 +925,7 @@
 
 function repopick() {
     T=$(gettop)
-    $T/vendor/cm/build/tools/repopick.py $@
+    $T/vendor/lineage/build/tools/repopick.py $@
 }
 
 function fixup_common_out_dir() {
diff --git a/build/tasks/addonsu.mk b/build/tasks/addonsu.mk
index 6979586..9b367c1 100644
--- a/build/tasks/addonsu.mk
+++ b/build/tasks/addonsu.mk
@@ -1,4 +1,4 @@
-ADDONSU_PREBUILTS_PATH := vendor/cm/addonsu/
+ADDONSU_PREBUILTS_PATH := vendor/lineage/addonsu/
 
 ADDONSU_INSTALL_OUT := $(PRODUCT_OUT)/addonsu-install/
 ADDONSU_INSTALL_TARGET := $(PRODUCT_OUT)/addonsu-$(PRODUCT_VERSION_MAJOR).$(PRODUCT_VERSION_MINOR)-$(TARGET_ARCH).zip
diff --git a/build/templates/extract-files.sh b/build/templates/extract-files.sh
index 1513081..744715b 100755
--- a/build/templates/extract-files.sh
+++ b/build/templates/extract-files.sh
@@ -27,7 +27,7 @@
 
 CM_ROOT="$MY_DIR"/../../..
 
-HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
+HELPER="$CM_ROOT"/vendor/lineage/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
diff --git a/build/templates/setup-makefiles.sh b/build/templates/setup-makefiles.sh
index 43baafe..a961eb9 100755
--- a/build/templates/setup-makefiles.sh
+++ b/build/templates/setup-makefiles.sh
@@ -29,7 +29,7 @@
 
 CM_ROOT="$MY_DIR"/../../..
 
-HELPER="$CM_ROOT"/vendor/cm/build/tools/extract_utils.sh
+HELPER="$CM_ROOT"/vendor/lineage/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index b735073..a34c31c 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -685,8 +685,8 @@
     local OAT=
 
     if [ -z "$BAKSMALIJAR" ] || [ -z "$SMALIJAR" ]; then
-        export BAKSMALIJAR="$CM_ROOT"/vendor/cm/build/tools/smali/baksmali.jar
-        export SMALIJAR="$CM_ROOT"/vendor/cm/build/tools/smali/smali.jar
+        export BAKSMALIJAR="$CM_ROOT"/vendor/lineage/build/tools/smali/baksmali.jar
+        export SMALIJAR="$CM_ROOT"/vendor/lineage/build/tools/smali/smali.jar
     fi
 
     # Extract existing boot.oats to the temp folder
@@ -837,7 +837,7 @@
             # If OTA is block based, extract it.
             elif [ -a "$DUMPDIR"/system.new.dat ]; then
                 echo "Converting system.new.dat to system.img"
-                python "$CM_ROOT"/vendor/cm/build/tools/sdat2img.py "$DUMPDIR"/system.transfer.list "$DUMPDIR"/system.new.dat "$DUMPDIR"/system.img 2>&1
+                python "$CM_ROOT"/vendor/lineage/build/tools/sdat2img.py "$DUMPDIR"/system.transfer.list "$DUMPDIR"/system.new.dat "$DUMPDIR"/system.img 2>&1
                 rm -rf "$DUMPDIR"/system.new.dat "$DUMPDIR"/system
                 mkdir "$DUMPDIR"/system "$DUMPDIR"/tmp
                 echo "Requesting sudo access to mount the system.img"