Add immediate instruction types
Rename some rules