Rename CID to CellID