Name conflict adjustments