nom -> name
Merge branch 'master' of https://github.com/gcolbert/ACEM