[CLEANUP] Make variables more consistent