Make variables more consistently named