Some renamings to reduce unnecessary variable naming diversity

Some minor changes, renaming variables. No functional changes were made. 

The goal is to make those naming slightly more consistent throughout the code, reducing unnecessary variable naming diversity in the repo.

Let me know what you think of them.