Update scraper.py

Mostly name cleanup