Renamed members according to coding conventions.