diff --git a/include/jemalloc/internal/edata.h b/include/jemalloc/internal/edata.h
index 632c6c32..5ec12beb 100644
--- a/include/jemalloc/internal/edata.h
+++ b/include/jemalloc/internal/edata.h
@@ -69,7 +69,7 @@ struct edata_map_info_s {
 
 /* Extent (span of pages).  Use accessor functions for e_* fields. */
 typedef struct edata_s edata_t;
-typedef ph(edata_t) edata_tree_t;
+typedef ph(edata_t) edata_avail_t;
 typedef ph(edata_t) edata_heap_t;
 typedef ph(edata_t) edata_age_heap_t;
 struct edata_s {
@@ -723,7 +723,7 @@ edata_age_comp(const edata_t *a, const edata_t *b) {
 	return edata_snad_comp(a, b);
 }
 
-ph_proto(, edata_avail_, edata_tree_t, edata_t)
+ph_proto(, edata_avail_, edata_avail_t, edata_t)
 ph_proto(, edata_heap_, edata_heap_t, edata_t)
 ph_proto(, edata_age_heap_, edata_age_heap_t, edata_t);
 
diff --git a/include/jemalloc/internal/edata_cache.h b/include/jemalloc/internal/edata_cache.h
index f7d0c319..9a54df0e 100644
--- a/include/jemalloc/internal/edata_cache.h
+++ b/include/jemalloc/internal/edata_cache.h
@@ -21,7 +21,7 @@
 
 typedef struct edata_cache_s edata_cache_t;
 struct edata_cache_s {
-	edata_tree_t avail;
+	edata_avail_t avail;
 	atomic_zu_t count;
 	malloc_mutex_t mtx;
 	base_t *base;
diff --git a/src/edata.c b/src/edata.c
index 214e993e..a6597312 100644
--- a/src/edata.c
+++ b/src/edata.c
@@ -1,7 +1,7 @@
 #include "jemalloc/internal/jemalloc_preamble.h"
 #include "jemalloc/internal/jemalloc_internal_includes.h"
 
-ph_gen(, edata_avail_, edata_tree_t, edata_t, ph_link,
+ph_gen(, edata_avail_, edata_avail_t, edata_t, ph_link,
     edata_esnead_comp)
 ph_gen(, edata_heap_, edata_heap_t, edata_t, ph_link, edata_snad_comp)
 ph_gen(, edata_age_heap_, edata_age_heap_t, edata_t, ph_link, edata_age_comp)