(maint) Refactor Variable Names

Cleaning up variable names used in code to better express what they are
used for to future contributions to this code base.