diff --git a/extract-files.sh b/extract-files.sh
old mode 100644
new mode 100755
index 9ec9f6b..49134da
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -26,7 +26,7 @@ if [[ ! -d "${MY_DIR}" ]]; then MY_DIR="${PWD}"; fi
 
 LINEAGE_ROOT="${MY_DIR}"/../../..
 
-HELPER="${AOSP_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
+HELPER="${LINEAGE_ROOT}/vendor/lineage/build/tools/extract_utils.sh"
 if [ ! -f "${HELPER}" ]; then
     echo "Unable to find helper script at ${HELPER}"
     exit 1
@@ -62,6 +62,7 @@ fi
 # Initialize the helper
 setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VENDOR}"
 
-extract "$MY_DIR"/proprietary-files.txt "$SRC"
+extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \
+        "${KANG}" --section "${SECTION}"
 
 "${MY_DIR}/setup-makefiles.sh"
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
old mode 100644
new mode 100755
index bab7f97..55ef411
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -18,7 +18,7 @@
 set -e
 
 VENDOR=samsung
-DEVICE=universal7570-common
+DEVICE_COMMON=universal7570-common
 
 export INITIAL_COPYRIGHT_YEAR=2017
 
@@ -36,10 +36,10 @@ fi
 source "${HELPER}"
 
 # Initialize the helper
-setup_vendor "${DEVICE}" "${VENDOR}" "${AOSP_ROOT}"
+setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true
 
 # Copyright headers and guards
-write_headers "universal7570-common"
+write_headers "j4lte"
 
 # The standard blobs
 write_makefiles "${MY_DIR}/proprietary-files.txt" true