No more pluralization of names :(