diff -r fe0d69d72bcd -r 35bcb3216c0d tests/test_list.c
--- a/tests/test_list.c	Thu May 23 20:29:28 2024 +0200
+++ b/tests/test_list.c	Thu May 23 20:31:37 2024 +0200
@@ -706,7 +706,7 @@
     CX_TEST_DO {
         CxList *list = cxLinkedListCreate(alloc, cx_cmp_int, sizeof(int));
         CX_TEST_ASSERT(list != NULL);
-        CX_TEST_ASSERT(list->base.item_size == sizeof(int));
+        CX_TEST_ASSERT(list->base.elem_size == sizeof(int));
         CX_TEST_ASSERT(list->base.simple_destructor == NULL);
         CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
         CX_TEST_ASSERT(list->base.destructor_data == NULL);
@@ -724,7 +724,7 @@
     CxList *list = cxLinkedListCreateSimple(sizeof(int));
     CX_TEST_DO {
         CX_TEST_ASSERT(list != NULL);
-        CX_TEST_ASSERT(list->base.item_size == sizeof(int));
+        CX_TEST_ASSERT(list->base.elem_size == sizeof(int));
         CX_TEST_ASSERT(list->base.simple_destructor == NULL);
         CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
         CX_TEST_ASSERT(list->base.destructor_data == NULL);
@@ -741,7 +741,7 @@
     CX_TEST_DO {
         CX_TEST_ASSERT(!cxListIsStoringPointers(list));
         cxListStorePointers(list);
-        CX_TEST_ASSERT(list->base.item_size == sizeof(void *));
+        CX_TEST_ASSERT(list->base.elem_size == sizeof(void *));
         CX_TEST_ASSERT(list->cl != NULL);
         CX_TEST_ASSERT(list->climpl != NULL);
         CX_TEST_ASSERT(cxListIsStoringPointers(list));
@@ -757,7 +757,7 @@
     CxList *list = cxLinkedListCreateSimple(CX_STORE_POINTERS);
     CX_TEST_DO {
         CX_TEST_ASSERT(list != NULL);
-        CX_TEST_ASSERT(list->base.item_size == sizeof(void*));
+        CX_TEST_ASSERT(list->base.elem_size == sizeof(void*));
         CX_TEST_ASSERT(list->base.simple_destructor == NULL);
         CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
         CX_TEST_ASSERT(list->base.destructor_data == NULL);
@@ -776,7 +776,7 @@
     CX_TEST_DO {
         CxList *list = cxArrayListCreate(alloc, cx_cmp_int, sizeof(int), 8);
         CX_TEST_ASSERT(list != NULL);
-        CX_TEST_ASSERT(list->base.item_size == sizeof(int));
+        CX_TEST_ASSERT(list->base.elem_size == sizeof(int));
         CX_TEST_ASSERT(list->base.simple_destructor == NULL);
         CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
         CX_TEST_ASSERT(list->base.destructor_data == NULL);
@@ -794,7 +794,7 @@
     CxList *list = cxArrayListCreateSimple(sizeof(int), 8);
     CX_TEST_DO {
         CX_TEST_ASSERT(list != NULL);
-        CX_TEST_ASSERT(list->base.item_size == sizeof(int));
+        CX_TEST_ASSERT(list->base.elem_size == sizeof(int));
         CX_TEST_ASSERT(list->base.simple_destructor == NULL);
         CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
         CX_TEST_ASSERT(list->base.destructor_data == NULL);
@@ -810,7 +810,7 @@
     CxList *list = cxArrayListCreateSimple(CX_STORE_POINTERS, 8);
     CX_TEST_DO {
         CX_TEST_ASSERT(list != NULL);
-        CX_TEST_ASSERT(list->base.item_size == sizeof(void*));
+        CX_TEST_ASSERT(list->base.elem_size == sizeof(void*));
         CX_TEST_ASSERT(list->base.simple_destructor == NULL);
         CX_TEST_ASSERT(list->base.advanced_destructor == NULL);
         CX_TEST_ASSERT(list->base.destructor_data == NULL);
@@ -1207,7 +1207,7 @@
     int *testdata = int_test_data_added_to_list(list, isptrlist, len);
 
     CxIterator iter = cxListIterator(list);
-    CX_TEST_ASSERT(iter.elem_size == list->base.item_size);
+    CX_TEST_ASSERT(iter.elem_size == list->base.elem_size);
     CX_TEST_ASSERT(iter.elem_count == list->base.size);
     size_t i = 0;
     cx_foreach(int*, x, iter) {
@@ -1225,7 +1225,7 @@
     CX_TEST_ASSERT(i == 0);
     i = len / 2;
     CxIterator mut_iter = cxListMutIteratorAt(list, i);
-    CX_TEST_ASSERT(mut_iter.elem_size == list->base.item_size);
+    CX_TEST_ASSERT(mut_iter.elem_size == list->base.elem_size);
     CX_TEST_ASSERT(mut_iter.elem_count == list->base.size);
     size_t j = 0;
     cx_foreach(int*, x, mut_iter) {