@@ -63,22 +63,22 @@
  *
  * \param key The key
  * \param obj The object
  * \return A new autoreleased OFDictionary
  */
-+ dictionaryWithKey: (OFObject <OFCopying>*)key
-	  andObject: (OFObject*)obj;
++ dictionaryWithObject: (OFObject*)obj
+		forKey: (OFObject <OFCopying>*)key;
 
 /**
  * Creates a new OFDictionary with the specified keys and objects.
  *
  * \param keys An array of keys
  * \param objs An array of objects
  * \return A new autoreleased OFDictionary
  */
-+ dictionaryWithKeys: (OFArray*)keys
-	  andObjects: (OFArray*)objs;
++ dictionaryWithObjects: (OFArray*)objs
+		forKeys: (OFArray*)keys;
 
 /**
  * Creates a new OFDictionary with the specified keys objects.
  *
  * \param first The first key
@@ -116,23 +116,23 @@
  *
  * \param key The key
  * \param obj The object
  * \return A new initialized OFDictionary
  */
-- initWithKey: (OFObject <OFCopying>*)key
-    andObject: (OFObject*)obj;
+- initWithObject: (OFObject*)obj
+	  forKey: (OFObject <OFCopying>*)key;
 
 /**
  * Initializes an already allocated OFDictionary with the specified keys and
  * objects.
  *
  * \param keys An array of keys
  * \param objs An array of objects
  * \return A new initialized OFDictionary
  */
-- initWithKeys: (OFArray*)keys
-    andObjects: (OFArray*)objs;
+- initWithObjects: (OFArray*)objs
+	  forKeys: (OFArray*)keys;
 
 /**
  * Initializes an already allocated OFDictionary with the specified keys and
  * objects.
  *
@@ -147,11 +147,11 @@
  *
  * \param first The first key
  * \return A new initialized OFDictionary
  */
 - initWithKey: (OFObject <OFCopying>*)first
-   andArgList: (va_list)args;
+      argList: (va_list)args;
 
 /**
  * \return The average number of items in a used bucket. Buckets that are
  *	   completely empty are not in the calculation. If this value is >= 2.0,
  *	   you should resize the dictionary, in most cases even earlier!