tweaks: rename a variable and a type, to be less confusing
3 files changed