move NamedQuery generic functions and deprecate Map variants