Which Companion drafted the terms of the Treaty of Hudaybiyyah?

The Messenger of Allah, Allah’s prayers and peace be upon him, concluded the Treaty of Hudaybiyyah on behalf of the Muslims, and Suhayl ibn Amr on behalf of Quraysh. Suhayl ibn Amr stipulated conditions that outwardly seemed unfair to the Muslims, such as writing “Bismika Allahumma” (In Your Name, O Allah) instead of “Bismillahir Rahmanir Rahim” (In the Name of Allah, the Most Gracious, the Most Merciful), and writing “Muhammad ibn Abdullah” (Muhammad son of Abdullah) instead of “Muhammad, Messenger of Allah,” and that the Muslims should not enter Makkah until the following year, and that any man who comes to Prophet Muhammad, Allah’s prayers and peace be upon him, from Quraysh as a Muslim should be returned.