@@ -29,18 +29,18 @@
 /**
  * \brief A class which provides easy to use double-linked lists.
  */
 @interface OFList: OFObject <OFCopying>
 {
-	of_list_object_t *first;
-	of_list_object_t *last;
+	of_list_object_t *firstListObject;
+	of_list_object_t *lastListObject;
 	size_t		 count;
 }
 
 #ifdef OF_HAVE_PROPERTIES
-@property (readonly) of_list_object_t *first;
-@property (readonly) of_list_object_t *last;
+@property (readonly) of_list_object_t *firstListObject;
+@property (readonly) of_list_object_t *lastListObject;
 @property (readonly) size_t count;
 #endif
 
 /**
  * \return A new autoreleased OFList
@@ -48,36 +48,36 @@
 + list;
 
 /**
  * \return The first list object in the list
  */
-- (of_list_object_t*)first;
+- (of_list_object_t*)firstListObject;
 
 /**
  * \return The last list object in the list
  */
-- (of_list_object_t*)last;
+- (of_list_object_t*)lastListObject;
 
 /**
  * Appends an object to the list.
  *
  * \param obj The object to append
  * \return An of_list_object_t, needed to identify the object inside the list.
  *	   For example, if you want to remove an object from the list, you need
  *	   its of_list_object_t.
  */
-- (of_list_object_t*)append: (OFObject*)obj;
+- (of_list_object_t*)appendObject: (OFObject*)obj;
 
 /**
  * Prepends an object to the list.
  *
  * \param obj The object to prepend
  * \return An of_list_object_t, needed to identify the object inside the list.
  *	   For example, if you want to remove an object from the list, you need
  *	   its of_list_object_t.
  */
-- (of_list_object_t*)prepend: (OFObject*)obj;
+- (of_list_object_t*)prependObject: (OFObject*)obj;
 
 /**
  * Inserts an object before another object.
  * \param obj The object to insert
  * \param listobj The of_list_object_t of the object before which it should be
@@ -84,12 +84,12 @@
  *	  inserted
  * \return An of_list_object_t, needed to identify the object inside the list.
  *	   For example, if you want to remove an object from the list, you need
  *	   its of_list_object_t.
  */
-- (of_list_object_t*)insert: (OFObject*)obj
-		     before: (of_list_object_t*)listobj;
+- (of_list_object_t*)insertObject: (OFObject*)obj
+		 beforeListObject: (of_list_object_t*)listobj;
 
 /**
  * Inserts an object after another object.
  * \param obj The object to insert
  * \param listobj The of_list_object_t of the object after which it should be
@@ -96,20 +96,20 @@
  *	  inserted
  * \return An of_list_object_t, needed to identify the object inside the list.
  *	   For example, if you want to remove an object from the list, you need
  *	   its of_list_object_t.
  */
-- (of_list_object_t*)insert: (OFObject*)obj
-		      after: (of_list_object_t*)listobj;
+- (of_list_object_t*)insertObject: (OFObject*)obj
+		  afterListObject: (of_list_object_t*)listobj;
 
 /**
  * Removes the object with the specified list object from the list.
  *
  * \param listobj The list object returned by append / prepend
  */
-- (void)remove: (of_list_object_t*)listobj;
+- (void)removeListObject: (of_list_object_t*)listobj;
 
 /**
  * \return The number of items in the list.
  */
 - (size_t)count;
 @end