Renamed class members to lower case