diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index 8056a7af1..a6f4e09ce 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -31,7 +31,7 @@ type controllerInformer interface {
 	GetOperatorConfig() *config.Config
 	GetStatus() *spec.ControllerStatus
 	TeamClusterList() map[string][]spec.NamespacedName
-	ClusterStatus(team, namespace, cluster string) (*cluster.Status, error)
+	ClusterStatus(team, namespace, cluster string) (*cluster.ClusterStatus, error)
 	ClusterLogs(team, namespace, cluster string) ([]*spec.LogEntry, error)
 	ClusterHistory(team, namespace, cluster string) ([]*spec.Diff, error)
 	ClusterDatabasesMap() map[string][]string
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index aadaae481..b2208705a 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -849,8 +849,8 @@ func (c *Cluster) GetCurrentProcess() Process {
 }
 
 // GetStatus provides status of the cluster
-func (c *Cluster) GetStatus() *Status {
-	return &Status{
+func (c *Cluster) GetStatus() *ClusterStatus {
+	return &ClusterStatus{
 		Cluster: c.Spec.ClusterName,
 		Team:    c.Spec.TeamID,
 		Status:  c.Status,
diff --git a/pkg/cluster/types.go b/pkg/cluster/types.go
index b283e652b..db6096aa3 100644
--- a/pkg/cluster/types.go
+++ b/pkg/cluster/types.go
@@ -52,8 +52,8 @@ type WorkerStatus struct {
 	CurrentProcess Process
 }
 
-// Status describes status of the cluster
-type Status struct {
+// ClusterStatus describes status of the cluster
+type ClusterStatus struct {
 	Team                string
 	Cluster             string
 	MasterService       *v1.Service
diff --git a/pkg/controller/logs_and_api.go b/pkg/controller/logs_and_api.go
index a6bba0c9d..3e5f20759 100644
--- a/pkg/controller/logs_and_api.go
+++ b/pkg/controller/logs_and_api.go
@@ -15,7 +15,7 @@ import (
 )
 
 // ClusterStatus provides status of the cluster
-func (c *Controller) ClusterStatus(team, namespace, cluster string) (*cluster.Status, error) {
+func (c *Controller) ClusterStatus(team, namespace, cluster string) (*cluster.ClusterStatus, error) {
 
 	clusterName := spec.NamespacedName{
 		Namespace: namespace,