diff --git a/internal/api/grpc/management/org.go b/internal/api/grpc/management/org.go
index dc5b3be8b4..70f509a4d7 100644
--- a/internal/api/grpc/management/org.go
+++ b/internal/api/grpc/management/org.go
@@ -98,7 +98,7 @@ func (s *Server) AddOrg(ctx context.Context, req *mgmt_pb.AddOrgRequest) (*mgmt_
 
 func (s *Server) UpdateOrg(ctx context.Context, req *mgmt_pb.UpdateOrgRequest) (*mgmt_pb.UpdateOrgResponse, error) {
 	ctxData := authz.GetCtxData(ctx)
-	org, err := s.command.UpdateOrg(ctx, ctxData.OrgID, req.Name)
+	org, err := s.command.ChangeOrg(ctx, ctxData.OrgID, req.Name)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/api/grpc/org/v2beta/org.go b/internal/api/grpc/org/v2beta/org.go
index 784ed31c88..bd585c54c2 100644
--- a/internal/api/grpc/org/v2beta/org.go
+++ b/internal/api/grpc/org/v2beta/org.go
@@ -26,7 +26,7 @@ func (s *Server) CreateOrganization(ctx context.Context, request *v2beta_org.Cre
 }
 
 func (s *Server) UpdateOrganization(ctx context.Context, request *v2beta_org.UpdateOrganizationRequest) (*v2beta_org.UpdateOrganizationResponse, error) {
-	org, err := s.command.UpdateOrg(ctx, request.Id, request.Name)
+	org, err := s.command.ChangeOrg(ctx, request.Id, request.Name)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/command/org.go b/internal/command/org.go
index 114cde4fe1..a018a90c82 100644
--- a/internal/command/org.go
+++ b/internal/command/org.go
@@ -342,7 +342,7 @@ func (c *Commands) addOrgWithIDAndMember(ctx context.Context, name, userID, reso
 	return orgWriteModelToOrg(addedOrg), nil
 }
 
-func (c *Commands) UpdateOrg(ctx context.Context, orgID, name string) (*domain.ObjectDetails, error) {
+func (c *Commands) ChangeOrg(ctx context.Context, orgID, name string) (*domain.ObjectDetails, error) {
 	name = strings.TrimSpace(name)
 	if orgID == "" || name == "" {
 		return nil, zerrors.ThrowInvalidArgument(nil, "EVENT-Mf9sd", "Errors.Org.Invalid")
@@ -353,10 +353,10 @@ func (c *Commands) UpdateOrg(ctx context.Context, orgID, name string) (*domain.O
 		return nil, err
 	}
 	if !isOrgStateExists(orgWriteModel.State) {
-		return writeModelToObjectDetails(&orgWriteModel.WriteModel), nil
+		return nil, zerrors.ThrowNotFound(nil, "ORG-1MRds", "Errors.Org.NotFound")
 	}
 	if orgWriteModel.Name == name {
-		return writeModelToObjectDetails(&orgWriteModel.WriteModel), nil
+		return nil, zerrors.ThrowPreconditionFailed(nil, "ORG-4VSdf", "Errors.Org.NotChanged")
 	}
 	orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel)
 	events := make([]eventstore.Command, 0)
@@ -388,7 +388,7 @@ func (c *Commands) DeactivateOrg(ctx context.Context, orgID string) (*domain.Obj
 		return nil, zerrors.ThrowNotFound(nil, "ORG-oL9nT", "Errors.Org.NotFound")
 	}
 	if orgWriteModel.State == domain.OrgStateInactive {
-		return writeModelToObjectDetails(&orgWriteModel.WriteModel), nil
+		return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-Dbs2g", "Errors.Org.AlreadyDeactivated")
 	}
 	orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel)
 	pushedEvents, err := c.eventstore.Push(ctx, org.NewOrgDeactivatedEvent(ctx, orgAgg))
@@ -411,7 +411,7 @@ func (c *Commands) ReactivateOrg(ctx context.Context, orgID string) (*domain.Obj
 		return nil, zerrors.ThrowNotFound(nil, "ORG-Dgf3g", "Errors.Org.NotFound")
 	}
 	if orgWriteModel.State == domain.OrgStateActive {
-		return writeModelToObjectDetails(&orgWriteModel.WriteModel), nil
+		return nil, zerrors.ThrowPreconditionFailed(nil, "EVENT-bfnrh", "Errors.Org.AlreadyActive")
 	}
 	orgAgg := OrgAggregateFromWriteModel(&orgWriteModel.WriteModel)
 	pushedEvents, err := c.eventstore.Push(ctx, org.NewOrgReactivatedEvent(ctx, orgAgg))
diff --git a/internal/command/org_test.go b/internal/command/org_test.go
index 2eec42c5a4..4ec85d61e1 100644
--- a/internal/command/org_test.go
+++ b/internal/command/org_test.go
@@ -756,7 +756,7 @@ func TestCommandSide_ChangeOrg(t *testing.T) {
 			r := &Commands{
 				eventstore: tt.fields.eventstore,
 			}
-			_, err := r.UpdateOrg(tt.args.ctx, tt.args.orgID, tt.args.name)
+			_, err := r.ChangeOrg(tt.args.ctx, tt.args.orgID, tt.args.name)
 			if tt.res.err == nil {
 				assert.NoError(t, err)
 			}