Improve recurrent transfer tests - mostly renaming