OK let's call them "components" and move on...
Merge pull request #82 from leftclickben/Ugh

OK let's call them "components" and move on...