Explicitly refer to descriptors, vs. components

@spicyj -- per our earlier conversation. This PR tries to call out descriptors vs. components more explicitly.
This was correct before.