renames + fixes to support findGroups and findUsers
renames + fixes to support findGroups and findUsers