Fully replaced all uses of Tag for a simpler Lookup-by-component-name formulation