Enrich names

closes #554