Rename token types part 2