diff --git a/models/controllers/meshery_broker.go b/models/controllers/meshery_broker.go
index 93f83cb3..c7d2020b 100644
--- a/models/controllers/meshery_broker.go
+++ b/models/controllers/meshery_broker.go
@@ -45,8 +45,8 @@ func (mb *mesheryBroker) GetStatus() MesheryControllerStatus {
 	// TODO: Confirm if the presence of operator is needed to use the operator client sdk
 	_, err = operatorClient.CoreV1Alpha1().Brokers("meshery").Get(context.TODO(), "meshery-broker", metav1.GetOptions{})
 	if err == nil {
-		monitoringEndpoint, err := mb.GetEndpointForPort(brokerMonitoringPortName)
-		if err == nil {
+		monitoringEndpoint, endpoint_err := mb.GetEndpointForPort(brokerMonitoringPortName)
+		if endpoint_err == nil {
 			if ConnectivityTest(MesheryServer, monitoringEndpoint) {
 				mb.status = Connected
 				return mb.status
diff --git a/models/controllers/meshsync.go b/models/controllers/meshsync.go
index 7f8859df..900ba3ab 100644
--- a/models/controllers/meshsync.go
+++ b/models/controllers/meshsync.go
@@ -49,8 +49,8 @@ func (ms *meshsync) GetStatus() MesheryControllerStatus {
 			case v1.PodRunning:
 				ms.status = Running
 				broker := NewMesheryBrokerHandler(ms.kclient)
-				brokerEndpoint, err := broker.GetEndpointForPort(brokerMonitoringPortName)
-				if err != nil {
+				brokerEndpoint, endpoint_err := broker.GetEndpointForPort(brokerMonitoringPortName)
+				if endpoint_err != nil {
 					return ms.status
 				}
 				isConnected := ConnectivityTest(MeshSync, brokerEndpoint)
diff --git a/models/model/core/v1alpha1/component.go b/models/model/core/v1alpha1/component.go
index e51faa58..5dd04d84 100644
--- a/models/model/core/v1alpha1/component.go
+++ b/models/model/core/v1alpha1/component.go
@@ -42,7 +42,7 @@ type ComponentDefinition struct {
 	UpdatedAt       time.Time              `json:"-"`
 }
 type ComponentDefinitionDB struct {
-	ID      uuid.UUID `json:"id"`
+	ID      uuid.UUID `json:"componentDefinitionId"`
 	ModelID uuid.UUID `json:"-" gorm:"index:idx_component_definition_dbs_model_id,column:modelID"`
 	TypeMeta
 	DisplayName string          `json:"displayName" gorm:"displayName"`
diff --git a/models/model/core/v1alpha1/models.go b/models/model/core/v1alpha1/models.go
index 06076627..25fa9382 100644
--- a/models/model/core/v1alpha1/models.go
+++ b/models/model/core/v1alpha1/models.go
@@ -60,7 +60,7 @@ type Model struct {
 }
 
 type ModelDB struct {
-	ID          uuid.UUID   `json:"id"`
+	ID          uuid.UUID   `json:"modelDBId"`
 	CategoryID  uuid.UUID   `json:"-" gorm:"categoryID"`
 	Name        string      `json:"modelName" gorm:"modelName"`
 	Version     string      `json:"version"`