Replaced relevant instances of device with beacon

Please review @schilit