Variables named differently in the two source buildpacks, harmonizing