Migrate much of "corp" to be "team"