SYNC-1199

@dejuknow Can you check and fix other references to source/desintation. Thx.