rename some variables used in debug logging for clarity (and correctness)