Better naming
Merge pull request #1738 from phaidon/better-naming

Better naming