More wordsmithing on the comonent id stuff.