Rename some variable to check coveralls.io.
Merge remote-tracking branch 'origin/master'