Change scrapers to reflect variable names, etc. from class