Merge pull request #1277 from danmcp/master

Better Naming
Bug 901444
Fixing bad merge