Magic: The Gathering swaps more card terms for inclusivity