[infinispan-dev] Which QueryBuilder ?

It seems we have now 2 different interfaces both names "QueryBuilder" when using Infinispan Query. One is coming from Hibernate Search, and represents the "classic" way to build queries for Infinispan Query in embedded mode. The other one is new, and represents the simplified approach, also implemented for remote queries. Could we find an alternative name for the new API? It's certainly going to be confusing, even more when we'll have to document the differences, and which one is more suited for one use cases vs. another. Cheers, Sanne