diff --git a/lib/model/model.go b/lib/model/model.go
index 14724eb9..edc09eea 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -956,7 +956,7 @@ func (m *Model) AddConnection(conn Connection) {
 
 	conn.Start()
 
-	cm := m.clusterConfig(deviceID)
+	cm := m.generateClusterConfig(deviceID)
 	conn.ClusterConfig(cm)
 
 	m.fmut.RLock()
@@ -1476,8 +1476,9 @@ func (m *Model) numHashers(folder string) int {
 	return 1
 }
 
-// clusterConfig returns a ClusterConfigMessage that is correct for the given peer device
-func (m *Model) clusterConfig(device protocol.DeviceID) protocol.ClusterConfigMessage {
+// generateClusterConfig returns a ClusterConfigMessage that is correct for
+// the given peer device
+func (m *Model) generateClusterConfig(device protocol.DeviceID) protocol.ClusterConfigMessage {
 	cm := protocol.ClusterConfigMessage{
 		DeviceName:    m.deviceName,
 		ClientName:    m.clientName,
diff --git a/lib/model/model_test.go b/lib/model/model_test.go
index c2e72107..3b92fe6b 100644
--- a/lib/model/model_test.go
+++ b/lib/model/model_test.go
@@ -385,7 +385,7 @@ func TestClusterConfig(t *testing.T) {
 	m.AddFolder(cfg.Folders[1])
 	m.ServeBackground()
 
-	cm := m.clusterConfig(device2)
+	cm := m.generateClusterConfig(device2)
 
 	if l := len(cm.Folders); l != 2 {
 		t.Fatalf("Incorrect number of folders %d != 2", l)