Better naming
Merge pull request #1277 from danmcp/master

Better Naming