make names to standard
Merge pull request #250 from honghui/master

make names to standard