Index: src/OFObject.h
==================================================================
--- src/OFObject.h
+++ src/OFObject.h
@@ -138,12 +138,12 @@
  *
  * \param selector The selector of the class method to replace
  * \param class_ The class from which the new class method should be taken
  * \return The old implementation
  */
-+  (IMP)replaceClassMethod: (SEL)selector
-  withClassMethodFromClass: (Class)class_;
++ (IMP)replaceClassMethod: (SEL)selector
+      withMethodFromClass: (Class)class_;
 
 /**
  * Replaces an instance method implementation with another implementation.
  *
  * \param newimp The new implementation for the instance method
@@ -158,12 +158,12 @@
  *
  * \param selector The selector of the instance method to replace
  * \param class_ The class from which the new instance method should be taken
  * \return The old implementation
  */
-+  (IMP)replaceInstanceMethod: (SEL)selector
-  withInstanceMethodFromClass: (Class)class_;
++ (IMP)replaceInstanceMethod: (SEL)selector
+	 withMethodFromClass: (Class)class_;
 
 /**
  * Initializes an already allocated object.
  *
  * Derived classes may override this, but need to do self = [super init] before

Index: src/OFObject.m
==================================================================
--- src/OFObject.m
+++ src/OFObject.m
@@ -260,12 +260,12 @@
 
 	return oldimp;
 #endif
 }
 
-+  (IMP)replaceClassMethod: (SEL)selector
-  withClassMethodFromClass: (Class)class;
++ (IMP)replaceClassMethod: (SEL)selector
+      withMethodFromClass: (Class)class;
 {
 	IMP newimp;
 
 	if (![class isSubclassOfClass: self])
 		@throw [OFInvalidArgumentException newWithClass: self
@@ -316,12 +316,12 @@
 
 	return oldimp;
 #endif
 }
 
-+  (IMP)replaceInstanceMethod: (SEL)selector
-  withInstanceMethodFromClass: (Class)class;
++ (IMP)replaceInstanceMethod: (SEL)selector
+	 withMethodFromClass: (Class)class;
 {
 	IMP newimp;
 
 	if (![class isSubclassOfClass: self])
 		@throw [OFInvalidArgumentException newWithClass: self