diff --git a/go/zodb/btree/btree.go b/go/zodb/btree/btree.go
index 7b7f1dc639782ab16442aa717011fc25665a56f9..a1a1bc62ca91634c2ec92c5151470754d638e1f9 100644
--- a/go/zodb/btree/btree.go
+++ b/go/zodb/btree/btree.go
@@ -25,7 +25,7 @@
 //
 // node.Entryv() returns [] of (key, child/value).
 //
-// BTree.FirstBucket() and Bucket.Next() allows to iterate in terms of B鈦� tree nodes.
+// BTree.FirstBucket() and Bucket.Next() allow to iterate through leaf B鈦� tree nodes.
 //
 // --------
 //
diff --git a/go/zodb/btree/btree.go.in b/go/zodb/btree/btree.go.in
index f6edaf818be63c52b6b48ae9717c47b74c5de53b..c5f5b7fbb1296fa9474e4a3434cf3fa3be722f0b 100644
--- a/go/zodb/btree/btree.go.in
+++ b/go/zodb/btree/btree.go.in
@@ -135,12 +135,12 @@ func (b *Bucket) Entryv() []BucketEntry {
 
 // ---- node-level iteration ----
 
-// XXX
+// FirstBucket returns bucket containing the smallest key in the tree.
 func (t *BTree) FirstBucket() *Bucket {
 	return t.firstbucket
 }
 
-// XXX
+// Next returns tree bucket with next larger keys relative to current bucket.
 func (b *Bucket) Next() *Bucket {
 	return b.next
 }
@@ -241,7 +241,7 @@ func (t *BTree) MinKey(ctx context.Context) (_ KEY, ok bool, err error) {
 		return 0, false, nil
 	}
 
-	// NOTE -> can also use t.firstBucket
+	// NOTE -> can also use t.firstbucket
 	for {
 		child := t.data[0].child.(zodb.IPersistent)
 		t.PDeactivate()
diff --git a/go/zodb/btree/ziobtree.go b/go/zodb/btree/ziobtree.go
index 5816975fb980f97a160f482652f0d3860bdce51d..adb9d584a8b8a7e78bc8dd0ad24464cec6470f5e 100644
--- a/go/zodb/btree/ziobtree.go
+++ b/go/zodb/btree/ziobtree.go
@@ -137,12 +137,12 @@ func (b *IOBucket) Entryv() []IOBucketEntry {
 
 // ---- node-level iteration ----
 
-// XXX
+// FirstBucket returns bucket containing the smallest key in the tree.
 func (t *IOBTree) FirstBucket() *IOBucket {
 	return t.firstbucket
 }
 
-// XXX
+// Next returns tree bucket with next larger keys relative to current bucket.
 func (b *IOBucket) Next() *IOBucket {
 	return b.next
 }
@@ -243,7 +243,7 @@ func (t *IOBTree) MinKey(ctx context.Context) (_ int32, ok bool, err error) {
 		return 0, false, nil
 	}
 
-	// NOTE -> can also use t.firstBucket
+	// NOTE -> can also use t.firstbucket
 	for {
 		child := t.data[0].child.(zodb.IPersistent)
 		t.PDeactivate()
diff --git a/go/zodb/btree/zlobtree.go b/go/zodb/btree/zlobtree.go
index e8c18fbc73f3b245e4bd75b2011e7bfc83741465..b591a414f4942d6a61242d94d346dfb5d858503c 100644
--- a/go/zodb/btree/zlobtree.go
+++ b/go/zodb/btree/zlobtree.go
@@ -137,12 +137,12 @@ func (b *LOBucket) Entryv() []LOBucketEntry {
 
 // ---- node-level iteration ----
 
-// XXX
+// FirstBucket returns bucket containing the smallest key in the tree.
 func (t *LOBTree) FirstBucket() *LOBucket {
 	return t.firstbucket
 }
 
-// XXX
+// Next returns tree bucket with next larger keys relative to current bucket.
 func (b *LOBucket) Next() *LOBucket {
 	return b.next
 }
@@ -243,7 +243,7 @@ func (t *LOBTree) MinKey(ctx context.Context) (_ int64, ok bool, err error) {
 		return 0, false, nil
 	}
 
-	// NOTE -> can also use t.firstBucket
+	// NOTE -> can also use t.firstbucket
 	for {
 		child := t.data[0].child.(zodb.IPersistent)
 		t.PDeactivate()