Don't invent the pretty names out of thin air

It's better to work with addresses without pretty names than duplicating the
address itself in there.