Try to de-dedupe names more nicely