correct from and to names