Merge pull request #463 from iamqizhao/master

revise naming package a bit