Index: src/OFNumber.h
==================================================================
--- src/OFNumber.h
+++ src/OFNumber.h
@@ -559,59 +559,59 @@
 
 /**
  * \param num The OFNumber to add
  * \return A new autoreleased OFNumber added with the specified OFNumber
  */
-- (OFNumber*)numberByAdding: (OFNumber*)num;
+- (OFNumber*)numberByAddingNumber: (OFNumber*)num;
 
 /**
  * \param num The OFNumber to substract
  * \return A new autoreleased OFNumber subtracted by the specified OFNumber
  */
-- (OFNumber*)numberBySubtracting: (OFNumber*)num;
+- (OFNumber*)numberBySubtractingNumber: (OFNumber*)num;
 
 /**
  * \param num The OFNumber to multiply with
  * \return A new autoreleased OFNumber multiplied with the specified OFNumber
  */
-- (OFNumber*)numberByMultiplyingWith: (OFNumber*)num;
+- (OFNumber*)numberByMultiplyingWithNumber: (OFNumber*)num;
 
 /**
  * \param num The OFNumber to divide by
  * \return A new autoreleased OFNumber devided by the specified OFNumber
  */
-- (OFNumber*)numberByDividingBy: (OFNumber*)num;
+- (OFNumber*)numberByDividingWithNumber: (OFNumber*)num;
 
 /**
  * ANDs two OFNumbers, returning a new one.
  *
  * Does not work with floating point types!
  *
  * \param num The number to AND with.
  * \return A new autoreleased OFNumber ANDed with the specified OFNumber
  */
-- (OFNumber*)numberByANDing: (OFNumber*)num;
+- (OFNumber*)numberByANDingWithNumber: (OFNumber*)num;
 
 /**
  * ORs two OFNumbers, returning a new one.
  *
  * Does not work with floating point types!
  *
  * \param num The number to OR with.
  * \return A new autoreleased OFNumber ORed with the specified OFNumber
  */
-- (OFNumber*)numberByORing: (OFNumber*)num;
+- (OFNumber*)numberByORingWithNumber: (OFNumber*)num;
 
 /**
  * XORs two OFNumbers, returning a new one.
  *
  * Does not work with floating point types!
  *
  * \param num The number to XOR with.
  * \return A new autoreleased OFNumber XORed with the specified OFNumber
  */
-- (OFNumber*)numberByXORing: (OFNumber*)num;
+- (OFNumber*)numberByXORingWithNumber: (OFNumber*)num;
 
 /**
  * Bitshifts the OFNumber to the left by the specified OFNumber, returning a new
  * one.
  *
@@ -619,11 +619,11 @@
  *
  * \param num The number of bits to shift to the left
  * \return A new autoreleased OFNumber bitshifted to the left with the
  *	   specified OFNumber
  */
-- (OFNumber*)numberByShiftingLeftBy: (OFNumber*)num;
+- (OFNumber*)numberByShiftingLeftWithNumber: (OFNumber*)num;
 
 /**
  * Bitshifts the OFNumber to the right by the specified OFNumber, returning a
  * new one.
  *
@@ -631,11 +631,11 @@
  *
  * \param num The number of bits to shift to the right
  * \return A new autoreleased OFNumber bitshifted to the right with the
  *	   specified OFNumber
  */
-- (OFNumber*)numberByShiftingRightBy: (OFNumber*)num;
+- (OFNumber*)numberByShiftingRightWithNumber: (OFNumber*)num;
 
 /**
  * \return A new autoreleased OFNumber with the value increased by one.
  */
 - (OFNumber*)numberByIncreasing;

Index: src/OFNumber.m
==================================================================
--- src/OFNumber.m
+++ src/OFNumber.m
@@ -865,51 +865,51 @@
 	default:
 		return [self uInt32Value];
 	}
 }
 
-- (OFNumber*)numberByAdding: (OFNumber*)num
+- (OFNumber*)numberByAddingNumber: (OFNumber*)num
 {
 	CALCULATE(+, num)
 }
 
-- (OFNumber*)numberBySubtracting: (OFNumber*)num
+- (OFNumber*)numberBySubtractingNumber: (OFNumber*)num
 {
 	CALCULATE(-, num)
 }
 
-- (OFNumber*)numberByMultiplyingWith: (OFNumber*)num
+- (OFNumber*)numberByMultiplyingWithNumber: (OFNumber*)num
 {
 	CALCULATE(*, num)
 }
 
-- (OFNumber*)numberByDividingBy: (OFNumber*)num
+- (OFNumber*)numberByDividingWithNumber: (OFNumber*)num
 {
 	CALCULATE(/, num)
 }
 
-- (OFNumber*)numberByANDing: (OFNumber*)num
+- (OFNumber*)numberByANDingWithNumber: (OFNumber*)num
 {
 	CALCULATE2(&, num)
 }
 
-- (OFNumber*)numberByORing: (OFNumber*)num
+- (OFNumber*)numberByORingWithNumber: (OFNumber*)num
 {
 	CALCULATE2(|, num)
 }
 
-- (OFNumber*)numberByXORing: (OFNumber*)num
+- (OFNumber*)numberByXORingWithNumber: (OFNumber*)num
 {
 	CALCULATE2(^, num)
 }
 
-- (OFNumber*)numberByShiftingLeftBy: (OFNumber*)num
+- (OFNumber*)numberByShiftingLeftWithNumber: (OFNumber*)num
 {
 	CALCULATE2(<<, num)
 }
 
-- (OFNumber*)numberByShiftingRightBy: (OFNumber*)num
+- (OFNumber*)numberByShiftingRightWithNumber: (OFNumber*)num
 {
 	CALCULATE2(>>, num)
 }
 
 - (OFNumber*)numberByIncreasing

Index: tests/OFNumberTests.m
==================================================================
--- tests/OFNumberTests.m
+++ tests/OFNumberTests.m
@@ -38,19 +38,19 @@
 	TEST(@"-[numberByDecreasing]",
 	    [[num numberByDecreasing]
 	    isEqual: [OFNumber numberWithInt32: 123456788]])
 
 	TEST(@"-[numberByDividingBy:]",
-	    [[num numberByDividingBy: [OFNumber numberWithInt: 2]] intValue] ==
-	    61728394)
+	    [[num numberByDividingWithNumber: [OFNumber numberWithInt: 2]]
+	    intValue] == 61728394)
 
 	TEST(@"-[numberByXORing:]",
-	    [[num numberByXORing: [OFNumber numberWithInt: 123456831]]
+	    [[num numberByXORingWithNumber: [OFNumber numberWithInt: 123456831]]
 	    intValue] == 42)
 
 	TEST(@"-[numberByShiftingRightBy:]",
-	    [[num numberByShiftingRightBy: [OFNumber numberWithInt: 8]]
+	    [[num numberByShiftingRightWithNumber: [OFNumber numberWithInt: 8]]
 	    intValue] == 482253)
 
 	[pool drain];
 }
 @end