Change namings of variables, methods and constants.
Merge remote-tracking branch 'origin/master'