renamed members and variables.