Exchange naming (12/29)

Exchange naming