Use correct field for beacon name, fix small type