Renaming variables for consistency

Authored by thomasfischer on Apr 23 2019, 7:34 PM.