Normalize names in output
:lipstick: