Changed the location of the underscore in Token attributes identifiers.