Refactoring: renaming
Merge pull request #4 from Floydian888/dev

Refactoring: renaming