Corrected threading of name-supply through nested components.