renaming variables in orchestrate(first step to simplify location.js)