diff -r 9754c40c732a -r 194e9ae964ed cubicweb/server/querier.py
--- a/cubicweb/server/querier.py	Fri Mar 15 21:35:59 2019 +0100
+++ b/cubicweb/server/querier.py	Wed Mar 13 10:26:15 2019 +0100
@@ -36,7 +36,7 @@
 
 from cubicweb.utils import QueryCache, RepeatList
 from cubicweb.misc.source_highlight import highlight_terminal
-from cubicweb.server.rqlannotation import SQLGenAnnotator, set_qdata
+from cubicweb.server.rqlannotation import RQLAnnotator, set_qdata
 from cubicweb.server.ssplanner import (READ_ONLY_RTYPES, add_types_restriction,
                                        SSPlanner)
 from cubicweb.server.edition import EditedEntity
@@ -216,7 +216,7 @@
             noinvariant = ()
         if cached is None:
             self.rqlhelper.simplify(union)
-            self.querier.sqlgen_annotate(union)
+            self.querier.rqlannotator.annotate(union)
             set_qdata(self.schema.rschema, union, noinvariant)
         if union.has_text_query:
             self.cache_key = None
@@ -481,7 +481,7 @@
         # rql planner
         self._planner = SSPlanner(schema, self._repo.vreg.rqlhelper)
         # sql generation annotator
-        self.sqlgen_annotate = SQLGenAnnotator(schema).annotate
+        self.rqlannotator = RQLAnnotator(schema)
 
     def clear_caches(self, eids=None, etypes=None):
         if eids is None: