So you are saying the property names should be changed? Or should i remove the default query completely and leave an exception saying that a hydration query is required. This removes pretty much any dependency on the ORM anyway since the provided query will have the required ObjectManager reference in it.