diff --git a/components/engine/pkg/term/tc_other.go b/components/engine/pkg/term/tc.go
similarity index 100%
rename from components/engine/pkg/term/tc_other.go
rename to components/engine/pkg/term/tc.go
diff --git a/components/engine/pkg/term/term_unix.go b/components/engine/pkg/term/winsize.go
similarity index 100%
rename from components/engine/pkg/term/term_unix.go
rename to components/engine/pkg/term/winsize.go
diff --git a/components/engine/pkg/term/term_solaris.go b/components/engine/pkg/term/winsize_solaris_cgo.go
similarity index 97%
rename from components/engine/pkg/term/term_solaris.go
rename to components/engine/pkg/term/winsize_solaris_cgo.go
index ef113272db..39c1d3207c 100644
--- a/components/engine/pkg/term/term_solaris.go
+++ b/components/engine/pkg/term/winsize_solaris_cgo.go
@@ -1,4 +1,4 @@
-// +build solaris
+// +build solaris,cgo
 
 package term