Updated to match the new naming conventions in Visitor.