Rename of some visitors which are not visitors.