Normalises naming conventions