diff --git a/agent/algorithm/logging.go b/agent/algorithm/logging.go
index e1289511..4836f0e9 100644
--- a/agent/algorithm/logging.go
+++ b/agent/algorithm/logging.go
@@ -17,9 +17,9 @@ var (
 )
 
 const (
-	bufSize      = 1024
-	algorithmRun = "AlgorithmRun"
-	errorStatus  = "Error"
+	bufSize       = 1024
+	algorithmRun  = "AlgorithmRun"
+	warningStatus = "Warning"
 )
 
 type Stdout struct {
@@ -70,7 +70,7 @@ func (s *Stderr) Write(p []byte) (n int, err error) {
 		s.Logger.Error(string(buf[:n]))
 	}
 
-	if err := s.EventSvc.SendEvent(algorithmRun, errorStatus, json.RawMessage{}); err != nil {
+	if err := s.EventSvc.SendEvent(algorithmRun, warningStatus, json.RawMessage{}); err != nil {
 		return len(p), err
 	}
 
diff --git a/agent/algorithm/logging_test.go b/agent/algorithm/logging_test.go
index 91427028..1c5e846b 100644
--- a/agent/algorithm/logging_test.go
+++ b/agent/algorithm/logging_test.go
@@ -73,7 +73,7 @@ func TestStderrWrite(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			mockEventService := mocks.NewService(t)
-			mockEventService.On("SendEvent", "AlgorithmRun", manager.Error.String(), mock.Anything).Return(nil)
+			mockEventService.On("SendEvent", "AlgorithmRun", manager.Warning.String(), mock.Anything).Return(nil)
 
 			stderr := &Stderr{Logger: mglog.NewMock(), EventSvc: mockEventService}
 			n, err := stderr.Write([]byte(tt.input))
diff --git a/agent/state.go b/agent/state.go
index cafee0b8..a6b2192d 100644
--- a/agent/state.go
+++ b/agent/state.go
@@ -33,7 +33,7 @@ const (
 	Ready
 	Completed
 	Terminated
-	Error
+	Warning
 )
 
 type event uint8
diff --git a/agent/status_string.go b/agent/status_string.go
index 0b19bb19..a2fdf1bb 100644
--- a/agent/status_string.go
+++ b/agent/status_string.go
@@ -13,12 +13,12 @@ func _() {
 	_ = x[Ready-2]
 	_ = x[Completed-3]
 	_ = x[Terminated-4]
-	_ = x[Error-5]
+	_ = x[Warning-5]
 }
 
-const _Status_name = "IdleStateInProgressReadyCompletedTerminatedError"
+const _Status_name = "IdleStateInProgressReadyCompletedTerminatedWarning"
 
-var _Status_index = [...]uint8{0, 9, 19, 24, 33, 43, 48}
+var _Status_index = [...]uint8{0, 9, 19, 24, 33, 43, 50}
 
 func (i Status) String() string {
 	if i >= Status(len(_Status_index)-1) {
diff --git a/manager/vm/logging.go b/manager/vm/logging.go
index 1449a330..8fb4e076 100644
--- a/manager/vm/logging.go
+++ b/manager/vm/logging.go
@@ -121,7 +121,7 @@ func (s *Stderr) Write(p []byte) (n int, err error) {
 				EventType:     manager.VmRunning.String(),
 				Timestamp:     timestamppb.Now(),
 				Originator:    "manager",
-				Status:        manager.Error.String(),
+				Status:        manager.Warning.String(),
 			},
 		},
 	}
diff --git a/manager/vm/logging_test.go b/manager/vm/logging_test.go
index 04c25d6d..87222111 100644
--- a/manager/vm/logging_test.go
+++ b/manager/vm/logging_test.go
@@ -122,7 +122,7 @@ func TestStderrWrite(t *testing.T) {
 						assert.NotNil(t, agentEvent)
 						assert.Equal(t, "test-computation", agentEvent.ComputationId)
 						assert.Equal(t, manager.VmRunning.String(), agentEvent.EventType)
-						assert.Equal(t, manager.Error.String(), agentEvent.Status)
+						assert.Equal(t, manager.Warning.String(), agentEvent.Status)
 						assert.NotNil(t, agentEvent.Timestamp)
 					}
 				case <-time.After(time.Second):
diff --git a/pkg/manager/manager_states.go b/pkg/manager/manager_states.go
index 9f1f8ec1..b7c74758 100644
--- a/pkg/manager/manager_states.go
+++ b/pkg/manager/manager_states.go
@@ -17,6 +17,6 @@ type ManagerStatus uint8
 const (
 	Starting ManagerStatus = iota
 	Stopped
-	Error
+	Warning
 	Disconnected
 )
diff --git a/pkg/manager/managerstatus_string.go b/pkg/manager/managerstatus_string.go
index 5ddb2206..9572c1aa 100644
--- a/pkg/manager/managerstatus_string.go
+++ b/pkg/manager/managerstatus_string.go
@@ -10,13 +10,13 @@ func _() {
 	var x [1]struct{}
 	_ = x[Starting-0]
 	_ = x[Stopped-1]
-	_ = x[Error-2]
+	_ = x[Warning-2]
 	_ = x[Disconnected-3]
 }
 
-const _ManagerStatus_name = "StartingStoppedErrorDisconnected"
+const _ManagerStatus_name = "StartingStoppedWarningDisconnected"
 
-var _ManagerStatus_index = [...]uint8{0, 8, 15, 20, 32}
+var _ManagerStatus_index = [...]uint8{0, 8, 15, 22, 34}
 
 func (i ManagerStatus) String() string {
 	if i >= ManagerStatus(len(_ManagerStatus_index)-1) {