Name conformity, built out team related classes.