Support the latest jedi dev branch token names (all lowercase now)