rewrote how users belong to teams, many renames