insn/core: rename extra-related classes