Rename to Beacon and Player