Fix some CHIP_NAME() entries to use canonical names.