Switch to cstruct's new names.