Cosmetic: add some consistency to var naming