Adjustments for mappings and boosts, and add full name tokens