Change order and rename tokentype