Use DOM4 naming convention for tokens.

nodeName,nodeValue --> name,value

Change-Id: I6b5dc0ee6a6510e1dd4ada168505520f9c1e6ca8
Merge "Use DOM4 naming convention for tokens."