synopsis: Include component name in unit-id
issues: #6485
prs: #6547