change token names to match aldor grammar