Class fields names change to follow Android code style
Merge remote-tracking branch 'origin/master'