Renamed more methods and fields