refactoring names of class variables to have uniform looking code: no functionality was changed