renames + fixes to support findGroups and findUsers