Renamed methods properly