Use CamelCase, then from OXM to Oxm
Introduce Instruction interface and fix typo
Add todo comment