Final main scraper + change of names