Changed type names to be more readable in the Assembler