Should all say component, added comments in DD to fix