Exchange naming (4/29)

Exchange naming