I think we should go with the name only because the rest of the examples on the site use it. If the cid is a better method, we should change it everywhere.