Renamed some confusing methods