make.js: rename a couple of vars