@@ -61,12 +61,13 @@
 	return last;
 }
 
 - (of_list_object_t*)append: (id)obj
 {
-	of_list_object_t *o = [self allocWithSize: sizeof(of_list_object_t)];
+	of_list_object_t *o;
 
+	o = [self allocMemoryWithSize: sizeof(of_list_object_t)];
 	o->object = obj;
 	o->next = NULL;
 	o->prev = last;
 
 	if (last != NULL)
@@ -82,12 +83,13 @@
 	return o;
 }
 
 - (of_list_object_t*)prepend: (id)obj
 {
-	of_list_object_t *o = [self allocWithSize: sizeof(of_list_object_t)];
+	of_list_object_t *o;
 
+	o = [self allocMemoryWithSize: sizeof(of_list_object_t)];
 	o->object = obj;
 	o->next = first;
 	o->prev = NULL;
 
 	if (first != NULL)
@@ -104,12 +106,13 @@
 }
 
 - (of_list_object_t*)insert: (id)obj
 		     before: (of_list_object_t*)listobj
 {
-	of_list_object_t *o = [self allocWithSize: sizeof(of_list_object_t)];
+	of_list_object_t *o;
 
+	o = [self allocMemoryWithSize: sizeof(of_list_object_t)];
 	o->object = obj;
 	o->next = listobj;
 	o->prev = listobj->prev;
 
 	if (listobj->prev != NULL)
@@ -127,12 +130,13 @@
 }
 
 - (of_list_object_t*)insert: (id)obj
 		      after: (of_list_object_t*)listobj
 {
-	of_list_object_t *o = [self allocWithSize: sizeof(of_list_object_t)];
+	of_list_object_t *o;
 
+	o = [self allocMemoryWithSize: sizeof(of_list_object_t)];
 	o->object = obj;
 	o->next = listobj->next;
 	o->prev = listobj;
 
 	if (listobj->next != NULL)
@@ -162,11 +166,11 @@
 		last = listobj->prev;
 
 	if (retain_and_release)
 		[listobj->object release];
 
-	[self freeMem: listobj];
+	[self freeMemory: listobj];
 
 	return self;
 }
 
 - (size_t)count
@@ -212,11 +216,11 @@
 	o = NULL;
 	prev = NULL;
 
 	@try {
 		for (iter = first; iter != NULL; iter = iter->next) {
-			o = [new allocWithSize: sizeof(of_list_object_t)];
+			o = [new allocMemoryWithSize: sizeof(of_list_object_t)];
 			o->object = iter->object;
 			o->next = NULL;
 			o->prev = prev;
 
 			if (new->first == NULL)