diff --git a/src/compiler/rules/blank.cpp b/src/compiler/rules/blank.cpp
index 5d5e1583..5b99e8b3 100644
--- a/src/compiler/rules/blank.cpp
+++ b/src/compiler/rules/blank.cpp
@@ -13,7 +13,7 @@ namespace tree_sitter  {
             return "blank";
         }
         
-        void Blank::accept(RuleVisitor &visitor) const {
+        void Blank::accept(Visitor &visitor) const {
             visitor.visit(this);
         }
     }
diff --git a/src/compiler/rules/blank.h b/src/compiler/rules/blank.h
index abcee2ac..8d9b72eb 100644
--- a/src/compiler/rules/blank.h
+++ b/src/compiler/rules/blank.h
@@ -10,7 +10,7 @@ namespace tree_sitter  {
             Blank();
             bool operator==(const Rule& other) const;
             std::string to_string() const;
-            void accept(RuleVisitor &visitor) const;
+            void accept(Visitor &visitor) const;
         };
     }
 }
diff --git a/src/compiler/rules/char.cpp b/src/compiler/rules/char.cpp
index a8e40933..ee4543f3 100644
--- a/src/compiler/rules/char.cpp
+++ b/src/compiler/rules/char.cpp
@@ -16,7 +16,7 @@ namespace tree_sitter  {
             return string("'") + value + "'";
         }
         
-        void Char::accept(RuleVisitor &visitor) const {
+        void Char::accept(Visitor &visitor) const {
             visitor.visit(this);
         }
     }
diff --git a/src/compiler/rules/char.h b/src/compiler/rules/char.h
index 702f03ac..cee5b3c8 100644
--- a/src/compiler/rules/char.h
+++ b/src/compiler/rules/char.h
@@ -10,7 +10,7 @@ namespace tree_sitter  {
             Char(char value);
             bool operator==(const Rule& other) const;
             std::string to_string() const;
-            void accept(RuleVisitor &visitor) const;
+            void accept(Visitor &visitor) const;
 
             const char value;
         };
diff --git a/src/compiler/rules/char_class.cpp b/src/compiler/rules/char_class.cpp
index eb7614e2..e06a42f0 100644
--- a/src/compiler/rules/char_class.cpp
+++ b/src/compiler/rules/char_class.cpp
@@ -21,7 +21,7 @@ namespace tree_sitter  {
             }
         }
         
-        void CharClass::accept(RuleVisitor &visitor) const {
+        void CharClass::accept(Visitor &visitor) const {
             visitor.visit(this);
         }
     }
diff --git a/src/compiler/rules/char_class.h b/src/compiler/rules/char_class.h
index 033652e9..bf0e266a 100644
--- a/src/compiler/rules/char_class.h
+++ b/src/compiler/rules/char_class.h
@@ -15,7 +15,7 @@ namespace tree_sitter  {
             CharClass(CharClassType type);
             bool operator==(const Rule& other) const;
             std::string to_string() const;
-            void accept(RuleVisitor &visitor) const;
+            void accept(Visitor &visitor) const;
 
             const CharClassType value;
         };
diff --git a/src/compiler/rules/choice.cpp b/src/compiler/rules/choice.cpp
index d2157d9f..ac7b57ef 100644
--- a/src/compiler/rules/choice.cpp
+++ b/src/compiler/rules/choice.cpp
@@ -16,7 +16,7 @@ namespace tree_sitter  {
             return string("(choice ") + left->to_string() + " " + right->to_string() + ")";
         }
         
-        void Choice::accept(RuleVisitor &visitor) const {
+        void Choice::accept(Visitor &visitor) const {
             visitor.visit(this);
         }
     }
diff --git a/src/compiler/rules/choice.h b/src/compiler/rules/choice.h
index 405bd9b0..7cf04608 100644
--- a/src/compiler/rules/choice.h
+++ b/src/compiler/rules/choice.h
@@ -10,7 +10,7 @@ namespace tree_sitter {
             Choice(rule_ptr left, rule_ptr right);
             bool operator==(const Rule& other) const;
             std::string to_string() const;
-            void accept(RuleVisitor &visitor) const;
+            void accept(Visitor &visitor) const;
 
             const rule_ptr left;
             const rule_ptr right;
diff --git a/src/compiler/rules/pattern.cpp b/src/compiler/rules/pattern.cpp
index 0d2b7e5f..82f4dcb7 100644
--- a/src/compiler/rules/pattern.cpp
+++ b/src/compiler/rules/pattern.cpp
@@ -112,7 +112,7 @@ namespace tree_sitter {
             return value;
         }
         
-        void Pattern::accept(RuleVisitor &visitor) const {
+        void Pattern::accept(Visitor &visitor) const {
             visitor.visit(this);
         }
         
diff --git a/src/compiler/rules/pattern.h b/src/compiler/rules/pattern.h
index eb7680a8..4033ecfa 100644
--- a/src/compiler/rules/pattern.h
+++ b/src/compiler/rules/pattern.h
@@ -11,7 +11,7 @@ namespace tree_sitter {
             Pattern(const std::string &string);
             bool operator==(const Rule& other) const;
             std::string to_string() const;
-            void accept(RuleVisitor &visitor) const;
+            void accept(Visitor &visitor) const;
             rule_ptr to_rule_tree() const;
         };
     }
diff --git a/src/compiler/rules/repeat.cpp b/src/compiler/rules/repeat.cpp
index 699c066a..d12010e7 100644
--- a/src/compiler/rules/repeat.cpp
+++ b/src/compiler/rules/repeat.cpp
@@ -16,7 +16,7 @@ namespace tree_sitter {
             return string("(repeat ") + content->to_string() + ")";
         }
         
-        void Repeat::accept(RuleVisitor &visitor) const {
+        void Repeat::accept(Visitor &visitor) const {
             visitor.visit(this);
         }
     }
diff --git a/src/compiler/rules/repeat.h b/src/compiler/rules/repeat.h
index dc7608dc..db1a99f6 100644
--- a/src/compiler/rules/repeat.h
+++ b/src/compiler/rules/repeat.h
@@ -10,7 +10,7 @@ namespace tree_sitter  {
             Repeat(rule_ptr content);
             bool operator==(const Rule& other) const;
             std::string to_string() const;
-            void accept(RuleVisitor &visitor) const;
+            void accept(Visitor &visitor) const;
 
             const rule_ptr content;
         };
diff --git a/src/compiler/rules/rule.h b/src/compiler/rules/rule.h
index 275fc1f4..fea3f331 100644
--- a/src/compiler/rules/rule.h
+++ b/src/compiler/rules/rule.h
@@ -5,13 +5,13 @@
 
 namespace tree_sitter {
     namespace rules {
-        class RuleVisitor;
+        class Visitor;
 
         class Rule {
         public:
             virtual bool operator==(const Rule& other) const = 0;
             virtual std::string to_string() const = 0;
-            virtual void accept(RuleVisitor &visitor) const = 0;
+            virtual void accept(Visitor &visitor) const = 0;
         };
         
         typedef std::shared_ptr<const Rule> rule_ptr;
diff --git a/src/compiler/rules/rule_visitor.cpp b/src/compiler/rules/rule_visitor.cpp
index 508f7e01..a36156f9 100644
--- a/src/compiler/rules/rule_visitor.cpp
+++ b/src/compiler/rules/rule_visitor.cpp
@@ -2,14 +2,14 @@
 
 namespace tree_sitter {
     namespace rules {
-        void RuleVisitor::visit(const Blank *rule) {}
-        void RuleVisitor::visit(const Symbol *rule) {}
-        void RuleVisitor::visit(const Char *rule) {}
-        void RuleVisitor::visit(const CharClass *rule) {}
-        void RuleVisitor::visit(const Choice *rule) {}
-        void RuleVisitor::visit(const Repeat *rule) {}
-        void RuleVisitor::visit(const Seq *rule) {}
-        void RuleVisitor::visit(const String *rule) {}
-        void RuleVisitor::visit(const Pattern *rule) {}
+        void Visitor::visit(const Blank *rule) {}
+        void Visitor::visit(const Symbol *rule) {}
+        void Visitor::visit(const Char *rule) {}
+        void Visitor::visit(const CharClass *rule) {}
+        void Visitor::visit(const Choice *rule) {}
+        void Visitor::visit(const Repeat *rule) {}
+        void Visitor::visit(const Seq *rule) {}
+        void Visitor::visit(const String *rule) {}
+        void Visitor::visit(const Pattern *rule) {}
     }
 }
\ No newline at end of file
diff --git a/src/compiler/rules/rule_visitor.h b/src/compiler/rules/rule_visitor.h
index 9e83b3d0..679328e6 100644
--- a/src/compiler/rules/rule_visitor.h
+++ b/src/compiler/rules/rule_visitor.h
@@ -5,7 +5,7 @@
 
 namespace tree_sitter {
     namespace rules {
-        class RuleVisitor {
+        class Visitor {
         public:
             virtual void visit(const Blank *rule);
             virtual void visit(const Symbol *rule);
diff --git a/src/compiler/rules/seq.cpp b/src/compiler/rules/seq.cpp
index 8ef9a67a..33bd6f30 100644
--- a/src/compiler/rules/seq.cpp
+++ b/src/compiler/rules/seq.cpp
@@ -16,7 +16,7 @@ namespace tree_sitter {
             return string("(seq ") + left->to_string() + " " + right->to_string() + ")";
         }
         
-        void Seq::accept(RuleVisitor &visitor) const {
+        void Seq::accept(Visitor &visitor) const {
             visitor.visit(this);
         }
     }
diff --git a/src/compiler/rules/seq.h b/src/compiler/rules/seq.h
index 79b66682..a4a0c340 100644
--- a/src/compiler/rules/seq.h
+++ b/src/compiler/rules/seq.h
@@ -10,7 +10,7 @@ namespace tree_sitter  {
             Seq(rule_ptr left, rule_ptr right);
             bool operator==(const Rule& other) const;
             std::string to_string() const;
-            void accept(RuleVisitor &visitor) const;
+            void accept(Visitor &visitor) const;
 
             const rule_ptr left;
             const rule_ptr right;
diff --git a/src/compiler/rules/string.cpp b/src/compiler/rules/string.cpp
index ef5864d5..0cf8faaa 100644
--- a/src/compiler/rules/string.cpp
+++ b/src/compiler/rules/string.cpp
@@ -16,7 +16,7 @@ namespace tree_sitter  {
             return string("(string '") + value + "')";
         }        
         
-        void String::accept(RuleVisitor &visitor) const {
+        void String::accept(Visitor &visitor) const {
             visitor.visit(this);
         }
     }
diff --git a/src/compiler/rules/string.h b/src/compiler/rules/string.h
index ace109e1..09232b09 100644
--- a/src/compiler/rules/string.h
+++ b/src/compiler/rules/string.h
@@ -10,7 +10,7 @@ namespace tree_sitter  {
             String(std::string value);
             bool operator==(const Rule& other) const;
             std::string to_string() const;
-            void accept(RuleVisitor &visitor) const;
+            void accept(Visitor &visitor) const;
 
             const std::string value;
         };
diff --git a/src/compiler/rules/symbol.cpp b/src/compiler/rules/symbol.cpp
index 33f04dc6..d815f1ce 100644
--- a/src/compiler/rules/symbol.cpp
+++ b/src/compiler/rules/symbol.cpp
@@ -16,7 +16,7 @@ namespace tree_sitter  {
             return string("(sym '") + name + "')";
         }
         
-        void Symbol::accept(RuleVisitor &visitor) const {
+        void Symbol::accept(Visitor &visitor) const {
             visitor.visit(this);
         }
     }
diff --git a/src/compiler/rules/symbol.h b/src/compiler/rules/symbol.h
index fe54d577..7c9b0aa6 100644
--- a/src/compiler/rules/symbol.h
+++ b/src/compiler/rules/symbol.h
@@ -10,7 +10,7 @@ namespace tree_sitter  {
             Symbol(const std::string &name);
             bool operator==(const Rule& other) const;
             std::string to_string() const;
-            void accept(RuleVisitor &visitor) const;
+            void accept(Visitor &visitor) const;
 
             const std::string name;
         };        
diff --git a/src/compiler/rules/transitions.cpp b/src/compiler/rules/transitions.cpp
index c40da8ab..5bbdf410 100644
--- a/src/compiler/rules/transitions.cpp
+++ b/src/compiler/rules/transitions.cpp
@@ -3,7 +3,7 @@
 
 namespace tree_sitter {
     namespace rules {
-        class TransitionsVisitor : public RuleVisitor {
+        class TransitionsVisitor : public Visitor {
         public:
             TransitionMap<Rule> value;