Finalized teambuilder changes
Better name changing