diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index 37253020..319131d9 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -480,7 +480,7 @@ func upgradeViaRest() error {
 	cfg, _ := loadConfig()
 	target := cfg.GUI().URL()
 	r, _ := http.NewRequest("POST", target+"/rest/system/upgrade", nil)
-	r.Header.Set("X-API-Key", cfg.GUI().RawAPIKey)
+	r.Header.Set("X-API-Key", cfg.GUI().APIKey)
 
 	tr := &http.Transport{
 		Dial:            dialer.Dial,
diff --git a/lib/config/config.go b/lib/config/config.go
index be3b9b02..6d0920c1 100644
--- a/lib/config/config.go
+++ b/lib/config/config.go
@@ -229,8 +229,8 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
 		cfg.Options.ReconnectIntervalS = 5
 	}
 
-	if cfg.GUI.RawAPIKey == "" {
-		cfg.GUI.RawAPIKey = randomString(32)
+	if cfg.GUI.APIKey == "" {
+		cfg.GUI.APIKey = randomString(32)
 	}
 }
 
diff --git a/lib/config/config_test.go b/lib/config/config_test.go
index a6bfe71c..008402d2 100644
--- a/lib/config/config_test.go
+++ b/lib/config/config_test.go
@@ -485,7 +485,7 @@ func TestCopy(t *testing.T) {
 	cfg.Devices[0].Addresses[0] = "wrong"
 	cfg.Folders[0].Devices[0].DeviceID = protocol.DeviceID{0, 1, 2, 3}
 	cfg.Options.ListenAddress[0] = "wrong"
-	cfg.GUI.RawAPIKey = "wrong"
+	cfg.GUI.APIKey = "wrong"
 
 	bsChanged, err := json.MarshalIndent(cfg, "", "  ")
 	if err != nil {
diff --git a/lib/config/guiconfiguration.go b/lib/config/guiconfiguration.go
index 14b82457..fb6c3764 100644
--- a/lib/config/guiconfiguration.go
+++ b/lib/config/guiconfiguration.go
@@ -18,7 +18,7 @@ type GUIConfiguration struct {
 	User                string `xml:"user,omitempty" json:"user"`
 	Password            string `xml:"password,omitempty" json:"password"`
 	RawUseTLS           bool   `xml:"tls,attr" json:"useTLS"`
-	RawAPIKey           string `xml:"apikey,omitempty" json:"apiKey"`
+	APIKey              string `xml:"apikey,omitempty" json:"apiKey"`
 	InsecureAdminAccess bool   `xml:"insecureAdminAccess,omitempty" json:"insecureAdminAccess"`
 	Theme               string `xml:"theme" json:"theme" default:"default"`
 }
@@ -76,14 +76,14 @@ func (c GUIConfiguration) URL() string {
 	return u.String()
 }
 
-// Returns whether the given API key is valid, including both the value in config
-// and any overrides
+// IsValidAPIKey returns true when the given API key is valid, including both
+// the value in config and any overrides
 func (c GUIConfiguration) IsValidAPIKey(apiKey string) bool {
 	switch apiKey {
 	case "":
 		return false
 
-	case c.RawAPIKey, os.Getenv("STGUIAPIKEY"):
+	case c.APIKey, os.Getenv("STGUIAPIKEY"):
 		return true
 
 	default: