Name adjustments