diff --git a/pkg/acl/acltree/acltree.go b/pkg/acl/acltree/acltree.go
index b1aea86b..03828f37 100644
--- a/pkg/acl/acltree/acltree.go
+++ b/pkg/acl/acltree/acltree.go
@@ -40,7 +40,7 @@ type ACLTree interface {
 }
 
 type aclTree struct {
-	thread         treestorage.TreeStorage
+	treeStorage    treestorage.TreeStorage
 	accountData    *account.AccountData
 	updateListener TreeUpdateListener
 
@@ -69,7 +69,7 @@ func BuildACLTree(
 	changeBuilder := newChangeBuilder()
 
 	aclTree := &aclTree{
-		thread:            t,
+		treeStorage:       t,
 		accountData:       acc,
 		fullTree:          nil,
 		aclState:          nil,
@@ -80,7 +80,7 @@ func BuildACLTree(
 		changeBuilder:     changeBuilder,
 		updateListener:    listener,
 	}
-	err := aclTree.rebuildFromThread(false)
+	err := aclTree.rebuildFromStorage(false)
 	if err != nil {
 		return nil, err
 	}
@@ -104,7 +104,7 @@ func BuildACLTree(
 //			return err
 //		}
 //		if !valid {
-//			return a.rebuildFromThread(true)
+//			return a.rebuildFromStorage(true)
 //		}
 //	}
 //
@@ -125,7 +125,7 @@ func (a *aclTree) removeOrphans() {
 	// removing attached or invalid orphans
 	var toRemove []string
 
-	for _, orphan := range a.thread.Orphans() {
+	for _, orphan := range a.treeStorage.Orphans() {
 		if _, exists := a.fullTree.attached[orphan]; exists {
 			toRemove = append(toRemove, orphan)
 		}
@@ -133,10 +133,10 @@ func (a *aclTree) removeOrphans() {
 			toRemove = append(toRemove, orphan)
 		}
 	}
-	a.thread.RemoveOrphans(toRemove...)
+	a.treeStorage.RemoveOrphans(toRemove...)
 }
 
-func (a *aclTree) rebuildFromThread(fromStart bool) error {
+func (a *aclTree) rebuildFromStorage(fromStart bool) error {
 	a.treeBuilder.Init()
 	a.aclTreeBuilder.Init()
 
@@ -163,7 +163,7 @@ func (a *aclTree) rebuildFromThread(fromStart bool) error {
 			return err
 		}
 		if !valid {
-			return a.rebuildFromThread(true)
+			return a.rebuildFromStorage(true)
 		}
 	}
 	// TODO: there is a question how we can validate not only that the full tree is built correctly
@@ -210,7 +210,7 @@ func (a *aclTree) AddContent(build func(builder ChangeBuilder) error) (*Change,
 	}
 	a.fullTree.AddFast(ch)
 
-	err = a.thread.AddRawChange(&treestorage.RawChange{
+	err = a.treeStorage.AddRawChange(&treestorage.RawChange{
 		Payload:   marshalled,
 		Signature: ch.Signature(),
 		Id:        ch.Id,
@@ -219,7 +219,7 @@ func (a *aclTree) AddContent(build func(builder ChangeBuilder) error) (*Change,
 		return nil, err
 	}
 
-	a.thread.SetHeads([]string{ch.Id})
+	a.treeStorage.SetHeads([]string{ch.Id})
 	return ch, nil
 }
 
@@ -234,7 +234,7 @@ func (a *aclTree) AddChanges(changes ...*Change) (AddResult, error) {
 			return
 		}
 		a.removeOrphans()
-		a.thread.SetHeads(a.fullTree.Heads())
+		a.treeStorage.SetHeads(a.fullTree.Heads())
 		a.Unlock()
 		switch mode {
 		case Append:
@@ -247,11 +247,11 @@ func (a *aclTree) AddChanges(changes ...*Change) (AddResult, error) {
 	}()
 
 	for _, ch := range changes {
-		err = a.thread.AddChange(ch)
+		err = a.treeStorage.AddChange(ch)
 		if err != nil {
 			return AddResult{}, err
 		}
-		a.thread.AddOrphans(ch.Id)
+		a.treeStorage.AddOrphans(ch.Id)
 	}
 
 	prevHeads := a.fullTree.Heads()
@@ -265,7 +265,7 @@ func (a *aclTree) AddChanges(changes ...*Change) (AddResult, error) {
 		}, nil
 
 	case Rebuild:
-		err = a.rebuildFromThread(false)
+		err = a.rebuildFromStorage(false)
 		if err != nil {
 			return AddResult{}, err
 		}
@@ -276,7 +276,7 @@ func (a *aclTree) AddChanges(changes ...*Change) (AddResult, error) {
 			Summary:  AddResultSummaryRebuild,
 		}, nil
 	default:
-		// just rebuilding the state from start without reloading everything from thread
+		// just rebuilding the state from start without reloading everything from tree storage
 		// as an optimization we could've started from current heads, but I didn't implement that
 		a.aclState, err = a.aclStateBuilder.Build()
 		if err != nil {
diff --git a/pkg/acl/acltree/acltreestorage_test.go b/pkg/acl/acltree/acltreestorage_test.go
index dbeb469c..76f3a55d 100644
--- a/pkg/acl/acltree/acltreestorage_test.go
+++ b/pkg/acl/acltree/acltreestorage_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 )
 
-func TestBuildThreadWithACL(t *testing.T) {
+func Test_BuildTreeStorageWithACL(t *testing.T) {
 	keychain := treestoragebuilder.NewKeychain()
 	keychain.AddSigningKey("A")
 	keychain.AddEncryptionKey("A")
@@ -32,10 +32,10 @@ func TestBuildThreadWithACL(t *testing.T) {
 		t.Fatalf("build should not return error")
 	}
 	if len(thr.Heads()) == 0 {
-		t.Fatalf("thread should have non-empty heads")
+		t.Fatalf("tree storage should have non-empty heads")
 	}
 	if thr.Header() == nil {
-		t.Fatalf("thread should have non-empty header")
+		t.Fatalf("tree storage should have non-empty header")
 	}
 	assert.Equal(t, thr.Heads()[0], thr.Header().FirstChangeId)
 	assert.NotEmpty(t, thr.TreeID())
diff --git a/pkg/acl/treestorage/inmemory.go b/pkg/acl/treestorage/inmemory.go
index 07254c40..45e3b4ef 100644
--- a/pkg/acl/treestorage/inmemory.go
+++ b/pkg/acl/treestorage/inmemory.go
@@ -30,7 +30,7 @@ func NewInMemoryTreeStorage(firstChange *RawChange) (TreeStorage, error) {
 	if err != nil {
 		return nil, err
 	}
-	threadId, err := cid.NewCIDFromBytes(marshalledHeader)
+	treeId, err := cid.NewCIDFromBytes(marshalledHeader)
 	if err != nil {
 		return nil, err
 	}
@@ -39,7 +39,7 @@ func NewInMemoryTreeStorage(firstChange *RawChange) (TreeStorage, error) {
 	changes[firstChange.Id] = firstChange
 
 	return &inMemoryTreeStorage{
-		id:      threadId,
+		id:      treeId,
 		header:  header,
 		heads:   []string{firstChange.Id},
 		orphans: nil,