refactor the class names
Merge branch 'master' of https://github.com/xianhengma/mahout-sg