Anticonflict name changes and formatting