Renaming stuff

Renamed methods and variables to match Java and Android conventions. Fixes issue #8