Rename to TemplateVisitor