unify the variables name
Merge pull request #98 from takashi/fix/unify-variables-name

unify the variables name