Issue #301: Add resource name to cid.