diff --git a/sandbox/vm/include/socks/vm.h b/sandbox/vm/include/socks/vm.h
index cc44b16..b7bf304 100644
--- a/sandbox/vm/include/socks/vm.h
+++ b/sandbox/vm/include/socks/vm.h
@@ -133,7 +133,7 @@ typedef struct vm_page {
 	   some examples:
 	     - the buddy allocator uses this to maintain its per-zone free-page lists.
         */
-	queue_entry_t p_free_list;
+	queue_entry_t p_list;
 
 } __attribute__((aligned(2 * sizeof(unsigned long)))) vm_page_t;
 
diff --git a/sandbox/vm/zone.c b/sandbox/vm/zone.c
index 9945bdc..22f0419 100644
--- a/sandbox/vm/zone.c
+++ b/sandbox/vm/zone.c
@@ -64,7 +64,7 @@ static void convert_region_to_blocks(vm_zone_t *zone,
 		vm_page_t *block_page = group_pages_into_block(zone, base, block_limit, order);
 
 		if (reserved == 0) {
-			queue_push_back(&zone->z_free_pages[order], &block_page->p_free_list);
+			queue_push_back(&zone->z_free_pages[order], &block_page->p_list);
 		}
 
 		base = block_limit + 1;
@@ -165,13 +165,13 @@ static int replenish_free_page_list(vm_zone_t *z, vm_page_order_t order)
 	   to the next order's free list. */
 	for (vm_page_order_t i = first_order_with_free; i > order; i--) {
 		queue_entry_t *pg_entry = queue_pop_front(&z->z_free_pages[i]);
-		vm_page_t *pg = QUEUE_CONTAINER(vm_page_t, p_free_list, pg_entry);
+		vm_page_t *pg = QUEUE_CONTAINER(vm_page_t, p_list, pg_entry);
 
 		vm_page_t *a, *b;
 		vm_page_split(pg, &a, &b);
 
-		queue_push_back(&z->z_free_pages[i - 1], &a->p_free_list);
-		queue_push_back(&z->z_free_pages[i - 1], &b->p_free_list);
+		queue_push_back(&z->z_free_pages[i - 1], &a->p_list);
+		queue_push_back(&z->z_free_pages[i - 1], &b->p_list);
 	}
 
 	return 0;
@@ -185,7 +185,7 @@ vm_page_t *vm_zone_alloc_page(vm_zone_t *z, vm_page_order_t order, vm_flags_t fl
 	}
 	
 	queue_entry_t *pg_entry = queue_pop_front(&z->z_free_pages[order]);
-	vm_page_t *pg = QUEUE_CONTAINER(vm_page_t, p_free_list, pg_entry);
+	vm_page_t *pg = QUEUE_CONTAINER(vm_page_t, p_list, pg_entry);
 	vm_page_foreach (pg, i) {
 		i->p_flags |= VM_PAGE_ALLOC;
 	}
@@ -196,7 +196,7 @@ vm_page_t *vm_zone_alloc_page(vm_zone_t *z, vm_page_order_t order, vm_flags_t fl
 void vm_zone_free_page(vm_zone_t *z, vm_page_t *pg)
 {
 	pg->p_flags &= ~VM_PAGE_ALLOC;
-	queue_push_back(&z->z_free_pages[pg->p_order], &pg->p_free_list);
+	queue_push_back(&z->z_free_pages[pg->p_order], &pg->p_list);
 
 	while (1) {
 		vm_page_t *buddy = vm_page_get_buddy(pg);
@@ -205,9 +205,9 @@ void vm_zone_free_page(vm_zone_t *z, vm_page_t *pg)
 			break;
 		}
 
-		queue_delete(&z->z_free_pages[buddy->p_order - 1], &buddy->p_free_list);
-		queue_delete(&z->z_free_pages[buddy->p_order - 1], &pg->p_free_list);
-		queue_push_back(&z->z_free_pages[huge->p_order], &huge->p_free_list);
+		queue_delete(&z->z_free_pages[buddy->p_order - 1], &buddy->p_list);
+		queue_delete(&z->z_free_pages[buddy->p_order - 1], &pg->p_list);
+		queue_push_back(&z->z_free_pages[huge->p_order], &huge->p_list);
 
 		pg = huge;
 	}