Cosmetic changes

Changed some variable names