Yet more naming standardization
Expansion of pre-VF faction ultimatum flavor handler