Use new Cql method names.