Exchange naming (20/29)

Exchange naming