change naming convection
Merge pull request #25 from winstonho/master

change naming convection