diff --git a/grammars/toml/query/invoice_date.ungram b/grammars/toml/query/invoice_date.ungram
index 47ef45c0..64a869d3 100644
--- a/grammars/toml/query/invoice_date.ungram
+++ b/grammars/toml/query/invoice_date.ungram
@@ -7,6 +7,6 @@
 /// A query for a `Person`.
 TomlInvoiceDateQuery =
   '[' 'ident_parent.'* 'issued]literal_newline'
-  QueryUuid 'literal_newline'
+  TomlUuidQuery 'literal_newline'
   '[' 'ident_parent.'* 'paid]literal_newline'
-  QueryString
+  TomlStringQuery
diff --git a/grammars/toml/query/location.ungram b/grammars/toml/query/location.ungram
index 4aa95d52..a4012a34 100644
--- a/grammars/toml/query/location.ungram
+++ b/grammars/toml/query/location.ungram
@@ -5,11 +5,11 @@
 /// A query for a `Location`.
 TomlLocationQuery =
   '[' 'ident_parent.'* 'id]literal_newline'
-  QueryUuid 'literal_newline'
+  TomlUuidQuery 'literal_newline'
   '[' 'ident_parent.'* 'outer]literal_newline'
   TomlLocationQueryOuter 'literal_newline'
   '[' 'ident_parent.'* 'name]literal_newline'
-  QueryString
+  TomlStringQuery
 
 /// A query for the `outer` `Location` of some `Location`.
 TomlLocationQueryOuter =
diff --git a/grammars/toml/query/organization.ungram b/grammars/toml/query/organization.ungram
index 4f581019..7462dc24 100644
--- a/grammars/toml/query/organization.ungram
+++ b/grammars/toml/query/organization.ungram
@@ -5,8 +5,8 @@
 /// A query for an `Organization`.
 TomlOrganizationQuery =
   '[' 'ident_parent.'* 'id]literal_newline'
-  QueryUuid 'literal_newline'
+  TomlUuidQuery 'literal_newline'
   '[' 'ident_parent.'* 'location]literal_newline'
   TomlLocationQuery
   '[' 'ident_parent.'* 'name]literal_newline'
-  QueryString
+  TomlStringQuery
diff --git a/grammars/toml/query/person.ungram b/grammars/toml/query/person.ungram
index 174b9349..3e4449d5 100644
--- a/grammars/toml/query/person.ungram
+++ b/grammars/toml/query/person.ungram
@@ -4,6 +4,6 @@
 /// A query for a `Person`.
 TomlPersonQuery =
   '[' 'ident_parent.'* 'id]literal_newline'
-  QueryUuid 'literal_newline'
+  TomlUuidQuery 'literal_newline'
   '[' 'ident_parent.'* 'name]literal_newline'
-  QueryString
+  TomlStringQuery
diff --git a/grammars/toml/query/string.ungram b/grammars/toml/query/string.ungram
index 64777052..246922b7 100644
--- a/grammars/toml/query/string.ungram
+++ b/grammars/toml/query/string.ungram
@@ -1,7 +1,7 @@
 //#include ../match
 
 /// A query for the `String` type.
-QueryString =
+TomlStringQuery =
   MatchAny
 | MatchCondition '"EqualTo"literal_newline'
   MatchValue String
diff --git a/grammars/toml/query/uuid.ungram b/grammars/toml/query/uuid.ungram
index aac9f2b7..384f3d23 100644
--- a/grammars/toml/query/uuid.ungram
+++ b/grammars/toml/query/uuid.ungram
@@ -2,7 +2,7 @@
 //#include ../types
 
 /// A query for the `Uuid` type.
-QueryUuid =
+TomlUuidQuery =
   MatchAny
 | MatchCondition '"EqualTo"literal_newline'
   MatchValue Uuid