Name changes

@stoodder @Gregadeaux @jeregrine @mitchellhenke @nickgartmann 

Changed some method names to match what @Gregadeaux is doing on Android

Updated code and doc