diff --git a/log/zap/buffered_write_syncer_test.go b/log/zap/buffered_write_syncer_test.go
index 8ed6e583cf4097d3894b9607c543cea2983a2a70..58e40098bb2370b7899d31fc42c2ea569ca81cf7 100644
--- a/log/zap/buffered_write_syncer_test.go
+++ b/log/zap/buffered_write_syncer_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/log"
-	logmocks "git.perx.ru/perxis/perxis-go/pkg/log/mocks"
+	"git.perx.ru/perxis/perxis-go/log"
+	logmocks "git.perx.ru/perxis/perxis-go/log/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
diff --git a/log/zap/core.go b/log/zap/core.go
index f2b220eab78a6cd2416408385b521c743bcefb94..fc0a81e7e18fae3e84500cda61473175d724b39b 100644
--- a/log/zap/core.go
+++ b/log/zap/core.go
@@ -72,8 +72,8 @@ func (core *Core) getEntry(entry zapcore.Entry, fields []zapcore.Field) *log.Ent
 	ent.Category, _ = enc.Fields["category"].(string)
 	ent.Component, _ = enc.Fields["component"].(string)
 	ent.Event, _ = enc.Fields["event"].(string)
-	ent.ObjectID, _ = enc.Fields["object"].(*oid.ObjectId)
-	ent.CallerID, _ = enc.Fields["caller"].(*oid.ObjectId)
+	ent.ObjectID, _ = enc.Fields["object_id"].(*oid.ObjectId)
+	ent.CallerID, _ = enc.Fields["caller_id"].(*oid.ObjectId)
 	ent.Attr = enc.Fields["attr"]
 
 	if tags, ok := enc.Fields["tags"].([]any); ok {
diff --git a/log/zap/core_test.go b/log/zap/core_test.go
index 4147dc3e891eff88922d7f473f76f6e846acf13f..b61e11b2a2be249d0ed558bc9f6c8d4f98fc7f66 100644
--- a/log/zap/core_test.go
+++ b/log/zap/core_test.go
@@ -3,6 +3,7 @@ package zap
 import (
 	"testing"
 
+	"git.perx.ru/perxis/perxis-go/id"
 	"git.perx.ru/perxis/perxis-go/log"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
@@ -32,8 +33,8 @@ func TestCore_getEntry(t *testing.T) {
 					Category("create"),
 					Component("Items.Service"),
 					Event("Items.Create"),
-					Object("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"),
-					Caller("/users/PHVz"),
+					ObjectID("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"),
+					CallerID("/users/PHVz"),
 					Attr("any"),
 					Tags("tag1", "tag2", "tag3"),
 				},
@@ -44,8 +45,8 @@ func TestCore_getEntry(t *testing.T) {
 				Category:  "create",
 				Component: "Items.Service",
 				Event:     "Items.Create",
-				ObjectID:  "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl",
-				CallerID:  "/users/PHVz",
+				ObjectID:  id.MustObjectId("/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl"),
+				CallerID:  id.MustObjectId("/users/PHVz"),
 				Attr:      "any",
 				Tags:      []string{"tag1", "tag2", "tag3"},
 			},
diff --git a/log/zap/example_test.go b/log/zap/example_test.go
index a8918b6b2e782e298a5d2537ff691014a9e51ad2..2dad64d670a5d44da36980bf80475f79089dd9b5 100644
--- a/log/zap/example_test.go
+++ b/log/zap/example_test.go
@@ -6,6 +6,7 @@ import (
 	"slices"
 	"testing"
 
+	"git.perx.ru/perxis/perxis-go/id"
 	"git.perx.ru/perxis/perxis-go/log"
 	logmocks "git.perx.ru/perxis/perxis-go/log/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/auth"
@@ -19,14 +20,17 @@ import (
 )
 
 func TestExample(t *testing.T) {
+	item := items.NewItem("WPNN", "9VGP", "GxNv", "W0fl", nil, nil)
+	user := &users.User{ID: "294de355"}
+
 	wantEntries := []*log.Entry{
 		{
 			LogLevel:  log.Level(zapcore.InfoLevel),
 			Message:   "Successfully created",
 			Component: "Items",
 			Event:     items.EventCreateItem,
-			ObjectID:  "/spaces/WPNN/envs/9VGP/cols/GxNv/items/W0fl",
-			CallerID:  "/users/294de355",
+			ObjectID:  id.MustObjectId(item),
+			CallerID:  id.MustObjectId(user),
 			Tags:      []string{"tag1", "tag2", "tag3"},
 		},
 		{
@@ -34,8 +38,8 @@ func TestExample(t *testing.T) {
 			Message:   "Successfully updated",
 			Component: "Items",
 			Event:     items.EventUpdateItem,
-			ObjectID:  "/spaces/WPNN/envs/9VGP/cols/GxNv/items/cmV2cw",
-			CallerID:  "/users/294de355",
+			ObjectID:  id.MustObjectId(item),
+			CallerID:  id.MustObjectId(user),
 			Attr:      map[string]map[string]any{"title": {"old": "old title", "new": "new title"}},
 		},
 	}
@@ -56,7 +60,7 @@ func TestExample(t *testing.T) {
 		Once()
 
 	usersService := &usersmocks.Users{}
-	usersService.On("GetByIdentity", mock.Anything, "74d90aaf").Return(&users.User{ID: "294de355"}, nil).Once()
+	usersService.On("GetByIdentity", mock.Anything, "74d90aaf").Return(user, nil).Once()
 
 	factory := auth.PrincipalFactory{Users: usersService}
 
@@ -71,16 +75,16 @@ func TestExample(t *testing.T) {
 		// Отправка лога при создании item
 		logger.Info("Successfully created",
 			Event(items.EventCreateItem),
-			Object(items.NewItem("WPNN", "9VGP", "GxNv", "W0fl", nil, nil)),
-			CallerFromContext(ctx),
+			ObjectID(item),
+			CallerIDFromContext(ctx),
 			Tags("tag1", "tag2", "tag3"),
 		)
 
 		// Отправка лога при обновлении item
 		logger.Warn("Successfully updated",
 			Event(items.EventUpdateItem),
-			Object(items.NewItem("WPNN", "9VGP", "GxNv", "cmV2cw", nil, nil)),
-			CallerFromContext(ctx),
+			ObjectID(item),
+			CallerIDFromContext(ctx),
 			Attr(map[string]map[string]any{"title": {"old": "old title", "new": "new title"}}),
 		)
 	}