Enum extension + some other scraping fixes

why do you rename these three variables?