MOAR name improvements