Clean up scraper class to match naming conventions, re-enable in templates