fixed class member names