Renamed some methodes.