Renamed scanner class, etc.