FIXUP: rename js vars for clarity