Fix inconsistent cnf structure method naming