Exchange naming (7/29)

Exchange naming