diff --git a/src/engine/migrate.go b/src/engine/migrate.go
index 77071286..0f5b5b1f 100644
--- a/src/engine/migrate.go
+++ b/src/engine/migrate.go
@@ -106,6 +106,7 @@ func (segment *Segment) migrationOne(env environment.Environment) {
 		segment.migrateTemplate()
 		segment.migrateIconOverride("ssh_icon", "\uf817 ")
 		template := segment.Properties.GetString(properties.SegmentTemplate, segment.writer.Template())
+		template = strings.ReplaceAll(template, ".ComputerName", ".HostName")
 		if !segment.Properties.GetBool(properties.Property("display_host"), true) {
 			template = strings.ReplaceAll(template, "@{{ .HostName }}", "")
 		}
diff --git a/src/engine/migrate_test.go b/src/engine/migrate_test.go
index 283c8ba6..7ef353ab 100644
--- a/src/engine/migrate_test.go
+++ b/src/engine/migrate_test.go
@@ -310,6 +310,14 @@ func TestSegmentTemplateMigration(t *testing.T) {
 				"host_color": "#789012",
 			},
 		},
+		{
+			Case:     "SESSION - Existing template",
+			Expected: " {{ .UserName }}@{{ .HostName }} ",
+			Type:     SESSION,
+			Props: properties.Map{
+				"template": "{{ .UserName }}@{{ .ComputerName }}",
+			},
+		},
 	}
 	for _, tc := range cases {
 		segment := &Segment{