Modified AML names for byte and short to be the same as for int