diff --git a/apps/subgraph/schema.graphql b/apps/subgraph/schema.graphql
index 833d37b4c..81966247a 100644
--- a/apps/subgraph/schema.graphql
+++ b/apps/subgraph/schema.graphql
@@ -2,7 +2,7 @@ type MerkleTree @entity {
     id: ID!
     depth: Int!
     root: BigInt
-    numberOfLeaves: Int!
+    size: Int!
     group: Group!
 }
 
diff --git a/apps/subgraph/src/semaphore.ts b/apps/subgraph/src/semaphore.ts
index e98ad357a..eab53de2f 100644
--- a/apps/subgraph/src/semaphore.ts
+++ b/apps/subgraph/src/semaphore.ts
@@ -24,7 +24,7 @@ export function createGroup(event: GroupCreated): void {
     log.info("Creating group '{}'", [group.id])
 
     merkleTree.depth = 0
-    merkleTree.numberOfLeaves = 0
+    merkleTree.size = 0
     merkleTree.group = group.id
 
     group.timestamp = event.block.timestamp
@@ -76,12 +76,12 @@ export function addMember(event: MemberAdded): void {
         member.group = merkleTree.group
         member.identityCommitment = event.params.identityCommitment
         member.timestamp = event.block.timestamp
-        member.index = merkleTree.numberOfLeaves
+        member.index = merkleTree.size
 
         member.save()
 
         merkleTree.root = event.params.merkleTreeRoot
-        merkleTree.numberOfLeaves += 1
+        merkleTree.size += 1
 
         merkleTree.save()
 
@@ -187,7 +187,7 @@ export function addMembers(event: MembersAdded): void {
         }
 
         merkleTree.root = event.params.merkleTreeRoot
-        merkleTree.numberOfLeaves += identityCommitments.length
+        merkleTree.size += identityCommitments.length
 
         merkleTree.save()
     }
diff --git a/apps/subgraph/tests/semaphore.test.ts b/apps/subgraph/tests/semaphore.test.ts
index a15cb4eb7..f83f10f77 100644
--- a/apps/subgraph/tests/semaphore.test.ts
+++ b/apps/subgraph/tests/semaphore.test.ts
@@ -46,7 +46,7 @@ describe("Semaphore subgraph", () => {
             assert.fieldEquals("Group", groupId.toString(), "merkleTree", groupId.toString())
 
             assert.fieldEquals("MerkleTree", groupId.toString(), "depth", "0")
-            assert.fieldEquals("MerkleTree", groupId.toString(), "numberOfLeaves", "0")
+            assert.fieldEquals("MerkleTree", groupId.toString(), "size", "0")
             assert.fieldEquals("MerkleTree", groupId.toString(), "group", groupId.toString())
         })
     })
@@ -84,7 +84,7 @@ describe("Semaphore subgraph", () => {
             assert.fieldEquals("Member", id, "group", groupId.toString())
 
             assert.fieldEquals("MerkleTree", groupId.toString(), "root", "999")
-            assert.fieldEquals("MerkleTree", groupId.toString(), "numberOfLeaves", "1")
+            assert.fieldEquals("MerkleTree", groupId.toString(), "size", "1")
         })
     })
 
@@ -150,7 +150,7 @@ describe("Semaphore subgraph", () => {
             assert.fieldEquals("Member", id, "group", groupId.toString())
 
             assert.fieldEquals("MerkleTree", groupId.toString(), "root", "999")
-            assert.fieldEquals("MerkleTree", groupId.toString(), "numberOfLeaves", "3")
+            assert.fieldEquals("MerkleTree", groupId.toString(), "size", "3")
         })
     })