From 74eb82cfaa5e90d9014ccf21cfa559495ef44745 Mon Sep 17 00:00:00 2001
From: Chris Duarte <csduarte@users.noreply.github.com>
Date: Fri, 5 Jan 2018 05:43:55 -0800
Subject: [PATCH] rename DefaultTeamName to ExperimentalPrimaryTeam (#8039)

---
 config/default.json | 2 +-
 model/config.go     | 6 +++---
 utils/config.go     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/default.json b/config/default.json
index 7b9820aff7..740edee6b7 100644
--- a/config/default.json
+++ b/config/default.json
@@ -83,7 +83,7 @@
         "EnableConfirmNotificationsToChannel": true,
         "TeammateNameDisplay": "username",
         "ExperimentalTownSquareIsReadOnly": false,
-        "DefaultTeamName": ""
+        "ExperimentalPrimaryTeam": ""
     },
     "ClientRequirements": {
         "AndroidLatestVersion": "",
diff --git a/model/config.go b/model/config.go
index d18874ea1c..fb34d1a043 100644
--- a/model/config.go
+++ b/model/config.go
@@ -940,7 +940,7 @@ type TeamSettings struct {
 	EnableConfirmNotificationsToChannel *bool
 	TeammateNameDisplay                 *string
 	ExperimentalTownSquareIsReadOnly    *bool
-	DefaultTeamName                     *string
+	ExperimentalPrimaryTeam             *string
 }
 
 func (s *TeamSettings) SetDefaults() {
@@ -1037,8 +1037,8 @@ func (s *TeamSettings) SetDefaults() {
 		s.ExperimentalTownSquareIsReadOnly = NewBool(false)
 	}
 
-	if s.DefaultTeamName == nil {
-		s.DefaultTeamName = NewString("")
+	if s.ExperimentalPrimaryTeam == nil {
+		s.ExperimentalPrimaryTeam = NewString("")
 	}
 }
 
diff --git a/utils/config.go b/utils/config.go
index 5dcceba75e..e2622cff97 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -463,7 +463,7 @@ func getClientConfig(c *model.Config) map[string]string {
 	props["RestrictPrivateChannelManageMembers"] = *c.TeamSettings.RestrictPrivateChannelManageMembers
 	props["EnableXToLeaveChannelsFromLHS"] = strconv.FormatBool(*c.TeamSettings.EnableXToLeaveChannelsFromLHS)
 	props["TeammateNameDisplay"] = *c.TeamSettings.TeammateNameDisplay
-	props["DefaultTeamName"] = *c.TeamSettings.DefaultTeamName
+	props["ExperimentalPrimaryTeam"] = *c.TeamSettings.ExperimentalPrimaryTeam
 
 	props["AndroidLatestVersion"] = c.ClientRequirements.AndroidLatestVersion
 	props["AndroidMinVersion"] = c.ClientRequirements.AndroidMinVersion