Rename ZfOdmCollectionQueryManager to ZfCollectionQueryManager