Renamed some method according to their meaning