diff --git a/src/hnswbuild.c b/src/hnswbuild.c
index 6a4de17..e0e78c2 100644
--- a/src/hnswbuild.c
+++ b/src/hnswbuild.c
@@ -206,7 +206,7 @@ CreateNeighborPages(HnswBuildState * buildstate)
 		Buffer		buf;
 		Page		page;
 		GenericXLogState *state;
-		Size		neighborsz = HNSW_NEIGHBOR_TUPLE_SIZE(e->level, m);
+		Size		ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(e->level, m);
 
 		/* Can take a while, so ensure we can interrupt */
 		/* Needs to be called when no buffer locks are held */
@@ -219,7 +219,7 @@ CreateNeighborPages(HnswBuildState * buildstate)
 
 		HnswSetNeighborTuple(ntup, e, m);
 
-		if (!PageIndexTupleOverwrite(page, e->neighborOffno, (Item) ntup, neighborsz))
+		if (!PageIndexTupleOverwrite(page, e->neighborOffno, (Item) ntup, ntupSize))
 			elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));
 
 		/* Commit */
diff --git a/src/hnswinsert.c b/src/hnswinsert.c
index f659114..6ab7dca 100644
--- a/src/hnswinsert.c
+++ b/src/hnswinsert.c
@@ -34,7 +34,7 @@ GetInsertPage(Relation index)
  * Check for a free offset
  */
 static bool
-HnswFreeOffset(Relation index, Buffer buf, Page page, HnswElement element, Size neighborsz, Buffer *nbuf, Page *npage, OffsetNumber *freeOffno, OffsetNumber *freeNeighborOffno)
+HnswFreeOffset(Relation index, Buffer buf, Page page, HnswElement element, Size ntupSize, Buffer *nbuf, Page *npage, OffsetNumber *freeOffno, OffsetNumber *freeNeighborOffno)
 {
 	OffsetNumber offno;
 	OffsetNumber maxoffno = PageGetMaxOffsetNumber(page);
@@ -71,7 +71,7 @@ HnswFreeOffset(Relation index, Buffer buf, Page page, HnswElement element, Size
 			itemid = PageGetItemId(*npage, neighborOffno);
 
 			/* Check for space on neighbor tuple page */
-			if (PageGetFreeSpace(*npage) + ItemIdGetLength(itemid) - sizeof(ItemIdData) >= neighborsz)
+			if (PageGetFreeSpace(*npage) + ItemIdGetLength(itemid) - sizeof(ItemIdData) >= ntupSize)
 			{
 				*freeOffno = offno;
 				*freeNeighborOffno = neighborOffno;
diff --git a/src/hnswvacuum.c b/src/hnswvacuum.c
index 8a6ff3b..2c87430 100644
--- a/src/hnswvacuum.c
+++ b/src/hnswvacuum.c
@@ -195,7 +195,7 @@ RepairGraphElement(HnswVacuumState * vacuumstate, HnswElement element)
 	HnswElement entryPoint;
 	BufferAccessStrategy bas = vacuumstate->bas;
 	HnswNeighborTuple ntup = vacuumstate->ntup;
-	Size		neighborsz = HNSW_NEIGHBOR_TUPLE_SIZE(element->level, m);
+	Size		ntupSize = HNSW_NEIGHBOR_TUPLE_SIZE(element->level, m);
 
 	/* Check if any neighbors point to deleted values */
 	if (!NeedsUpdated(vacuumstate, element))
@@ -233,7 +233,7 @@ RepairGraphElement(HnswVacuumState * vacuumstate, HnswElement element)
 	/* Update neighbors */
 	HnswSetNeighborTuple(ntup, element, m);
 
-	if (!PageIndexTupleOverwrite(page, element->neighborOffno, (Item) ntup, neighborsz))
+	if (!PageIndexTupleOverwrite(page, element->neighborOffno, (Item) ntup, ntupSize))
 		elog(ERROR, "failed to add index item to \"%s\"", RelationGetRelationName(index));
 
 	/* Commit */