Anticonflict name changes and misc formatting