Variable name consistency
Merge branch 'master' of https://github.com/khanh111/zuck
Merge branch 'master' of https://github.com/khanh111/zuck