diff --git a/semantic-go/src/Language/Go/Grammar.hs b/semantic-go/src/Language/Go/Grammar.hs
index 999aea0fb..862d3c4ae 100644
--- a/semantic-go/src/Language/Go/Grammar.hs
+++ b/semantic-go/src/Language/Go/Grammar.hs
@@ -5,11 +5,11 @@ module Language.Go.Grammar
 ) where
 
 import Language.Haskell.TH
-import TreeSitter.Go.Internal
-import TreeSitter.Language
+import TreeSitter.Go (tree_sitter_go)
+import AST.Grammar.TH
 
 -- Regenerate template haskell code when these files change:
 addDependentFileRelative "../../../vendor/tree-sitter-go/src/parser.c"
 
 -- | Statically-known rules corresponding to symbols in the grammar.
-mkSymbolDatatype (mkName "Grammar") tree_sitter_go
+mkStaticallyKnownRuleGrammarData (mkName "Grammar") tree_sitter_go
diff --git a/semantic-java/src/Language/Java/Grammar.hs b/semantic-java/src/Language/Java/Grammar.hs
index a4908e28c..5ca2d0f06 100644
--- a/semantic-java/src/Language/Java/Grammar.hs
+++ b/semantic-java/src/Language/Java/Grammar.hs
@@ -5,12 +5,11 @@ module Language.Java.Grammar
 ) where
 
 import Language.Haskell.TH
--- import TreeSitter.Java.Internal
 import TreeSitter.Java (tree_sitter_java)
-import TreeSitter.Language
+import AST.Grammar.TH
 
 -- Regenerate template haskell code when these files change:
 addDependentFileRelative "../../../vendor/tree-sitter-java/src/parser.c"
 
 -- | Statically-known rules corresponding to symbols in the grammar.
-mkSymbolDatatype (mkName "Grammar") tree_sitter_java
+mkStaticallyKnownRuleGrammarData (mkName "Grammar") tree_sitter_java
diff --git a/semantic-json/src/Language/JSON/Grammar.hs b/semantic-json/src/Language/JSON/Grammar.hs
index 2333026ed..92644f61e 100644
--- a/semantic-json/src/Language/JSON/Grammar.hs
+++ b/semantic-json/src/Language/JSON/Grammar.hs
@@ -6,11 +6,10 @@ module Language.JSON.Grammar
 
 import Language.Haskell.TH
 import TreeSitter.JSON (tree_sitter_json)
--- import TreeSitter.JSON.Internal
-import TreeSitter.Language
+import AST.Grammar.TH
 
 -- Regenerate template haskell code when these files change:
 addDependentFileRelative "../../../vendor/tree-sitter-json/src/parser.c"
 
 -- | Statically-known rules corresponding to symbols in the grammar.
-mkSymbolDatatype (mkName "Grammar") tree_sitter_json
+mkStaticallyKnownRuleGrammarData (mkName "Grammar") tree_sitter_json
diff --git a/semantic-python/src/Language/Python/Grammar.hs b/semantic-python/src/Language/Python/Grammar.hs
index 5393172a1..c670a53e4 100644
--- a/semantic-python/src/Language/Python/Grammar.hs
+++ b/semantic-python/src/Language/Python/Grammar.hs
@@ -5,11 +5,11 @@ module Language.Python.Grammar
 ) where
 
 import Language.Haskell.TH
-import TreeSitter.Python.Internal
-import TreeSitter.Language
+import TreeSitter.Python (tree_sitter_python)
+import AST.Grammar.TH
 
 -- Regenerate template haskell code when these files change:
 addDependentFileRelative "../../../vendor/tree-sitter-python/src/parser.c"
 
 -- | Statically-known rules corresponding to symbols in the grammar.
-mkSymbolDatatype (mkName "Grammar") tree_sitter_python
+mkStaticallyKnownRuleGrammarData (mkName "Grammar") tree_sitter_python
diff --git a/semantic-ruby/src/Language/Ruby/Grammar.hs b/semantic-ruby/src/Language/Ruby/Grammar.hs
index a941aa415..553c5ecde 100644
--- a/semantic-ruby/src/Language/Ruby/Grammar.hs
+++ b/semantic-ruby/src/Language/Ruby/Grammar.hs
@@ -5,11 +5,11 @@ module Language.Ruby.Grammar
 ) where
 
 import Language.Haskell.TH
-import TreeSitter.Ruby.Internal
-import TreeSitter.Language
+import TreeSitter.Ruby (tree_sitter_ruby)
+import AST.Grammar.TH
 
 -- Regenerate template haskell code when these files change:
 addDependentFileRelative "../../../vendor/tree-sitter-ruby/src/parser.c"
 
 -- | Statically-known rules corresponding to symbols in the grammar.
-mkSymbolDatatype (mkName "Grammar") tree_sitter_ruby
+mkStaticallyKnownRuleGrammarData (mkName "Grammar") tree_sitter_ruby
diff --git a/semantic-typescript/src/Language/Grammar.hs b/semantic-typescript/src/Language/Grammar.hs
index a45796673..f4dc070dd 100644
--- a/semantic-typescript/src/Language/Grammar.hs
+++ b/semantic-typescript/src/Language/Grammar.hs
@@ -5,11 +5,11 @@ module Language.TypeScript.Grammar
 ) where
 
 import Language.Haskell.TH
-import TreeSitter.TypeScript.Internal
-import TreeSitter.Language
+import TreeSitter.TypeScript (tree_sitter_typescript)
+import AST.Grammar.TH
 
 -- Regenerate template haskell code when these files change:
 addDependentFileRelative "../../vendor/tree-sitter-typescript/typescript/src/parser.c"
 
 -- | Statically-known rules corresponding to symbols in the grammar.
-mkSymbolDatatype (mkName "Grammar") tree_sitter_typescript
+mkStaticallyKnownRuleGrammarData (mkName "Grammar") tree_sitter_typescript