We currently use both APIs in our code. We should make up our mind, choose our main API, and only use the other one when it's absolutely necessary.

I'd be tempted to use JPA as a main API, but we have to check what it means regarding HQL and Criteria (in particular).