Renamed some stuff in NPCDef