Core name adjustments

Adjust tests so that they use core name when checking distinctiveness of
abilities