Fix symbol names for extracted tokens