Update to some new cstructs names.