Changing naming to visitor.