Better name
Merge pull request #1736 from phaidon/naming

Better naming