Variable renamings to reduce unnecessary variable naming diversity

Some very minor variable renamings. No functional changes were made.

The goal is to make those naming slightly more consistent throughout the codebase, reducing unnecessary variable naming diversity in the repository.