I was uncertain about whether they (Elves) were supposed to be in ME. It's my understanding that the ones who didn't move to Valinor eventually became...orc-material. Or at least some of the Avari were. Do we have any stories about "non-orc precursor" Avari?
The Calaquendi, or Eldar, are broken into the Vanyar (Fair Elves, sometimes Light Elves), the Noldor ("Deep Elves", our good friends), and the Teleri (Sea-Elves).
Got it? There will be a quiz... as long as I'm throwing out Elf-names, Eldar means People of the Stars, and refers only to the Elves of the Journey. So Thingol could be considered an Eldar, and he's granted Calaquendi status because he went to Valinor once, but he rules Sindar, which are Teleri/Umanyar/Moriquendi.
I think we just ran into "too many names" syndrome again.