diff --git a/aosp-merger/_merge_helper.sh b/aosp-merger/_merge_helper.sh
index 7b2a6b0..3a59b18 100755
--- a/aosp-merger/_merge_helper.sh
+++ b/aosp-merger/_merge_helper.sh
@@ -28,14 +28,14 @@ fi
 
 ### CONSTANTS ###
 readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
-readonly vars_path="${script_path}/../vars"
+readonly vars_path="${script_path}/../../../vendor/lineage/vars"
 
 source "${vars_path}/common"
 
 readonly hook="${script_path}/prepare-commit-msg"
 
 TOP="${script_path}/../../.."
-BRANCH="${calyxos_branch}"
+BRANCH="${lineageos_branch}"
 
 cd "${TOP}/${PROJECTPATH}"
 repo start "${STAGINGBRANCH}" .
diff --git a/aosp-merger/aosp-merger.sh b/aosp-merger/aosp-merger.sh
index 33cdd20..16dff67 100755
--- a/aosp-merger/aosp-merger.sh
+++ b/aosp-merger/aosp-merger.sh
@@ -26,7 +26,7 @@ trap 'error_m interrupted!' SIGINT
 
 ### CONSTANTS ###
 readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
-readonly vars_path="${script_path}/../vars"
+readonly vars_path="${script_path}/../../../vendor/lineage/vars"
 
 source "${vars_path}/common"
 
@@ -47,7 +47,7 @@ merge_aosp() {
 }
 
 merge_aosp_forks() {
-  export STAGINGBRANCH="staging/${calyxos_branch}_merge-${common_aosp_tag}"
+  export STAGINGBRANCH="staging/${lineageos_branch}_merge-${common_aosp_tag}"
   "${script_path}"/merge-aosp-forks.sh merge "${prev_common_aosp_tag}" "${common_aosp_tag}"
 }
 
diff --git a/aosp-merger/merge-aosp-forks.sh b/aosp-merger/merge-aosp-forks.sh
index 1614204..8b4ea0c 100755
--- a/aosp-merger/merge-aosp-forks.sh
+++ b/aosp-merger/merge-aosp-forks.sh
@@ -27,13 +27,13 @@ fi
 
 ### CONSTANTS ###
 readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
-readonly vars_path="${script_path}/../vars"
+readonly vars_path="${script_path}/../../../vendor/lineage/vars"
 
 source "${vars_path}/common"
 
 TOP="${script_path}/../../.."
 MANIFEST="${TOP}/.repo/manifests/default.xml"
-BRANCH="${calyxos_branch}"
+BRANCH="${lineageos_branch}"
 
 # Source build environment (needed for aospremote)
 source "${TOP}/build/envsetup.sh"
diff --git a/aosp-merger/merge-aosp.sh b/aosp-merger/merge-aosp.sh
index 158af88..5471d41 100755
--- a/aosp-merger/merge-aosp.sh
+++ b/aosp-merger/merge-aosp.sh
@@ -28,7 +28,7 @@ fi
 
 ### CONSTANTS ###
 readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
-readonly vars_path="${script_path}/../vars"
+readonly vars_path="${script_path}/../../../vendor/lineage/vars"
 
 source "${vars_path}/common"
 
diff --git a/aosp-merger/push-merge.sh b/aosp-merger/push-merge.sh
index c2096a3..d0b9774 100755
--- a/aosp-merger/push-merge.sh
+++ b/aosp-merger/push-merge.sh
@@ -27,15 +27,15 @@ fi
 
 ### CONSTANTS ###
 readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
-readonly vars_path="${script_path}/../vars"
+readonly vars_path="${script_path}/../../../vendor/lineage/vars"
 
 source "${vars_path}/common"
 
 TOP="${script_path}/../../.."
-BRANCH="${calyxos_branch}"
+BRANCH="${lineageos_branch}"
 STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}"
 
-# Source build environment (needed for calyxremote)
+# Source build environment (needed for lineageremote)
 source "${TOP}/build/envsetup.sh"
 
 # List of merged repos
@@ -62,6 +62,6 @@ for PROJECTPATH in ${PROJECTPATHS}; do
     cd "${TOP}/${PROJECTPATH}"
     echo "#### Submitting ${PROJECTPATH} merge ####"
     git checkout "${STAGINGBRANCH}"
-    calyxremote | grep -v "Remote 'calyx' created"
-    git push calyx HEAD:refs/heads/"${BRANCH}"
+    lineageremote | grep -v "Remote 'lineage' created"
+    git push lineage HEAD:refs/heads/"${BRANCH}"
 done
diff --git a/aosp-merger/squash.sh b/aosp-merger/squash.sh
index 772e9a2..fbd8bd0 100755
--- a/aosp-merger/squash.sh
+++ b/aosp-merger/squash.sh
@@ -27,12 +27,12 @@ fi
 
 ### CONSTANTS ###
 readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
-readonly vars_path="${script_path}/../vars"
+readonly vars_path="${script_path}/../../../vendor/lineage/vars"
 
 source "${vars_path}/common"
 
 TOP="${script_path}/../../.."
-BRANCH="${calyxos_branch}"
+BRANCH="${lineageos_branch}"
 STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}"
 SQUASHBRANCH="squash/${BRANCH}_${OPERATION}-${NEWTAG}"
 
diff --git a/aosp-merger/upload-squash.sh b/aosp-merger/upload-squash.sh
index d650d5b..668c50e 100755
--- a/aosp-merger/upload-squash.sh
+++ b/aosp-merger/upload-squash.sh
@@ -27,12 +27,12 @@ fi
 
 ### CONSTANTS ###
 readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
-readonly vars_path="${script_path}/../vars"
+readonly vars_path="${script_path}/../../../vendor/lineage/vars"
 
 source "${vars_path}/common"
 
 TOP="${script_path}/../../.."
-BRANCH="${calyxos_branch}"
+BRANCH="${lineageos_branch}"
 SQUASHBRANCH="squash/${BRANCH}_${OPERATION}-${NEWTAG}"
 
 # List of merged repos
@@ -41,7 +41,7 @@ PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')
 echo "#### Branch = ${BRANCH} Squash branch = ${SQUASHBRANCH} ####"
 
 # Make sure manifest and forked repos are in a consistent state
-echo "#### Verifying there are no uncommitted changes on CalyxOS forked AOSP projects ####"
+echo "#### Verifying there are no uncommitted changes on LineageOS forked AOSP projects ####"
 for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
     cd "${TOP}/${PROJECTPATH}"
     if [[ -n "$(git status --porcelain)" ]]; then