Renamed tokens to merge tags for consistency.