Make class name correspond to location
Use correct field name