Singularize names and remove underscores wherever possible