Modification of names for conventions
Modification of names for conventions 2