API renamed queries.
Reorg.