Exchange naming (28/29)

Exchange naming