Tweaking token names & format