fix for entities that use @Entity(name=...)

if an Entity uses @Entity(name="xx") then this xx alias needs to be used in queries.