Adding unit name to unit-scoped collection lists (DHH-167)