Fixed use of legacy token names.