One name is enough

Don't have same-same but different names.
Merge pull request #1627 from jean/one-name

One name is enough