Renamed many classes, variables and methods