From 4a922d253c284cedceafab103fd092f2dff0e19e Mon Sep 17 00:00:00 2001
From: Sergey <smalenkov@anytype.io>
Date: Fri, 25 Apr 2025 16:40:35 +0200
Subject: [PATCH] GO-5297: Refactor: normalize naming

---
 core/pushnotification/service.go                            | 6 +++---
 .../components/aclobjectmanager/aclobjectmanager.go         | 6 +++---
 space/spacecore/spacekey/spacekey.go                        | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/pushnotification/service.go b/core/pushnotification/service.go
index 244b1074b..41241e3fa 100644
--- a/core/pushnotification/service.go
+++ b/core/pushnotification/service.go
@@ -202,7 +202,7 @@ func (s *service) Notify(ctx context.Context, spaceId string, topic []string, pa
 	if err != nil {
 		return err
 	}
-	keyId, signKey, err := spacekey.DeriveSpaceKey(firstMetadataKey)
+	spaceKeyId, signKey, err := spacekey.DeriveSpaceKey(firstMetadataKey)
 	if err != nil {
 		return err
 	}
@@ -219,7 +219,7 @@ func (s *service) Notify(ctx context.Context, spaceId string, topic []string, pa
 		return err
 	}
 	p := &pushapi.Message{
-		KeyId:     keyId,
+		KeyId:     spaceKeyId,
 		Payload:   encryptedJson,
 		Signature: signature,
 	}
@@ -235,7 +235,7 @@ func (s *service) prepareEncryptedPayload(state *list.AclState, payload []byte)
 	if err != nil {
 		return nil, err
 	}
-	encryptionKey, err := spacekey.DeriveEncryptionKey(symKey)
+	encryptionKey, err := spacekey.DeriveSymmetricKey(symKey)
 	if err != nil {
 		return nil, err
 	}
diff --git a/space/internal/components/aclobjectmanager/aclobjectmanager.go b/space/internal/components/aclobjectmanager/aclobjectmanager.go
index be01116a6..67afaa09d 100644
--- a/space/internal/components/aclobjectmanager/aclobjectmanager.go
+++ b/space/internal/components/aclobjectmanager/aclobjectmanager.go
@@ -283,11 +283,11 @@ func (a *aclObjectManager) broadcastKeyUpdate(aclState *list.AclState, common co
 	if err != nil {
 		return err
 	}
-	spaceKey, _, err := spacekey.DeriveSpaceKey(firstMetadataKey)
+	spaceKeyId, _, err := spacekey.DeriveSpaceKey(firstMetadataKey)
 	if err != nil {
 		return err
 	}
-	encryptionKey, err := spacekey.DeriveEncryptionKey(readKey)
+	encryptionKey, err := spacekey.DeriveSymmetricKey(readKey)
 	if err != nil {
 		return err
 	}
@@ -301,7 +301,7 @@ func (a *aclObjectManager) broadcastKeyUpdate(aclState *list.AclState, common co
 			{
 				SpaceId: common.Id(),
 				Value: &pb.EventMessageValueOfKeyUpdate{KeyUpdate: &pb.EventKeyUpdate{
-					SpaceKeyId:      spaceKey,
+					SpaceKeyId:      spaceKeyId,
 					EncryptionKeyId: aclState.CurrentReadKeyId(),
 					EncryptionKey:   encodedKey,
 				}},
diff --git a/space/spacecore/spacekey/spacekey.go b/space/spacecore/spacekey/spacekey.go
index 437880df1..49ecd25d5 100644
--- a/space/spacecore/spacekey/spacekey.go
+++ b/space/spacecore/spacekey/spacekey.go
@@ -29,7 +29,7 @@ func DeriveSpaceKey(firstMetadataKey crypto.PrivKey) (string, crypto.PrivKey, er
 	return encodedKey, key, nil
 }
 
-func DeriveEncryptionKey(readKey crypto.SymKey) (crypto.SymKey, error) {
+func DeriveSymmetricKey(readKey crypto.SymKey) (crypto.SymKey, error) {
 	raw, err := readKey.Raw()
 	if err != nil {
 		return nil, err