Improve naming in apptoken xml.