Switch to new cstructs names.