Adjust token class names to make EWF work with cmv3 branch.
Merge pull request #66 from adobe/rlim/fix-for-cmv3

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