@@ -67,11 +67,11 @@
 - initWithObject: (OFObject*)obj
 {
 	self = [self init];
 
 	@try {
-		[array add: &obj];
+		[array addItem: &obj];
 	} @catch (OFException *e) {
 		[self dealloc];
 		@throw e;
 	}
 
@@ -99,13 +99,13 @@
 	id obj;
 
 	self = [self init];
 
 	@try {
-		[array add: &first];
+		[array addItem: &first];
 		while ((obj = va_arg(args, id)) != nil) {
-			[array add: &obj];
+			[array addItem: &obj];
 			[obj retain];
 		}
 	} @catch (OFException *e) {
 		[self dealloc];
 		@throw e;
@@ -120,11 +120,11 @@
 
 	self = [self init];
 
 	@try {
 		for (obj = objs; *obj != nil; obj++) {
-			[array add: obj];
+			[array addItem: obj];
 			[*obj retain];
 		}
 	} @catch (OFException *e) {
 		[self dealloc];
 		@throw e;
@@ -169,13 +169,13 @@
 - (id)objectAtIndex: (size_t)index
 {
 	return *((OFObject**)[array itemAtIndex: index]);
 }
 
-- (id)last
+- (id)lastObject
 {
-	return *((OFObject**)[array last]);
+	return *((OFObject**)[array lastItem]);
 }
 
 - (BOOL)isEqual: (id)obj
 {
 	OFObject **objs, **objs2;
@@ -198,11 +198,11 @@
 			return NO;
 
 	return YES;
 }
 
-- add: (OFObject*)obj
+- addObject: (OFObject*)obj
 {
 	@throw [OFNotImplementedException newWithClass: isa
 					   andSelector: _cmd];
 }