Rename CyclicQuery -> Query and Query -> AcyclicQuery