Improve the Beacon API & fix warnings

Changed the name of some of the Beacon API methods.