tweaks: rename five variables, for uniformity with a few others
2 files changed