(REVIEW only) Adjust token class names to make EWF work with cmv3 branch.

Please don't merge it until cmv3 branch is ready to land in master. Otherwise, EWF won't work with master.