Rename some instruction/opcode types and utilities.

Manually cherry-picked