fixed some member names