Use consistent naming convention
Merge pull request #1 from sluu99/patch-1

Use consistent naming convention