Change member names to be more meaningful