diff --git a/lib/teleterm/apiserver/config.go b/lib/teleterm/apiserver/config.go
index 5671d2eed96..388090d509a 100644
--- a/lib/teleterm/apiserver/config.go
+++ b/lib/teleterm/apiserver/config.go
@@ -43,7 +43,7 @@ func (c *Config) CheckAndSetDefaults() error {
 	}
 
 	if c.Log == nil {
-		c.Log = logrus.WithField(trace.Component, "teleterm: api_server")
+		c.Log = logrus.WithField(trace.Component, "conn:apiserver")
 	}
 
 	return nil
diff --git a/lib/teleterm/clusters/config.go b/lib/teleterm/clusters/config.go
index 7d151b3db2b..743c28e7c06 100644
--- a/lib/teleterm/clusters/config.go
+++ b/lib/teleterm/clusters/config.go
@@ -46,7 +46,7 @@ func (c *Config) CheckAndSetDefaults() error {
 	}
 
 	if c.Log == nil {
-		c.Log = logrus.WithField(trace.Component, "teleterm: storage")
+		c.Log = logrus.WithField(trace.Component, "conn:storage")
 	}
 
 	return nil