Index: src/OFMutableString.h
==================================================================
--- src/OFMutableString.h
+++ src/OFMutableString.h
@@ -109,16 +109,16 @@
 - (void)reverse;
 
 /**
  * \brief Converts the OFMutableString to uppercase.
  */
-- (void)upper;
+- (void)uppercase;
 
 /**
  * \brief Converts the OFMutableString to lowercase.
  */
-- (void)lower;
+- (void)lowercase;
 
 /**
  * \brief Inserts a string at the specified index.
  *
  * \param string The string to insert

Index: src/OFMutableString.m
==================================================================
--- src/OFMutableString.m
+++ src/OFMutableString.m
@@ -378,17 +378,17 @@
 		[self setCharacter: tmp
 			   atIndex: i];
 	}
 }
 
-- (void)upper
+- (void)uppercase
 {
 	[self _applyTable: of_unicode_uppercase_table
 		 withSize: OF_UNICODE_UPPERCASE_TABLE_SIZE];
 }
 
-- (void)lower
+- (void)lowercase
 {
 	[self _applyTable: of_unicode_lowercase_table
 		 withSize: OF_UNICODE_LOWERCASE_TABLE_SIZE];
 }
 

Index: src/OFString.m
==================================================================
--- src/OFString.m
+++ src/OFString.m
@@ -1464,11 +1464,11 @@
 
 - (OFString*)uppercaseString
 {
 	OFMutableString *new = [[self mutableCopy] autorelease];
 
-	[new upper];
+	[new uppercase];
 
 	[new makeImmutable];
 
 	return new;
 }
@@ -1475,11 +1475,11 @@
 
 - (OFString*)lowercaseString
 {
 	OFMutableString *new = [[self mutableCopy] autorelease];
 
-	[new lower];
+	[new lowercase];
 
 	[new makeImmutable];
 
 	return new;
 }

Index: src/OFXMLParser.m
==================================================================
--- src/OFXMLParser.m
+++ src/OFXMLParser.m
@@ -436,11 +436,11 @@
 			if ([attribute isEqual: @"version"])
 				if (![value hasPrefix: @"1."])
 					return NO;
 
 			if ([attribute isEqual: @"encoding"]) {
-				[value lower];
+				[value lowercase];
 
 				if ([value isEqual: @"utf-8"])
 					encoding = OF_STRING_ENCODING_UTF_8;
 				else if ([value isEqual: @"iso-8859-1"])
 					encoding =

Index: tests/OFStringTests.m
==================================================================
--- tests/OFStringTests.m
+++ tests/OFStringTests.m
@@ -129,20 +129,22 @@
 
 	TEST(@"-[reverse]", R([s[0] reverse]) && [s[0] isEqual: @"3𝄞1€sät"])
 
 	s[1] = [OFMutableString stringWithString: @"abc"];
 
-	TEST(@"-[upper]", R([s[0] upper]) && [s[0] isEqual: @"3𝄞1€SÄT"] &&
-	    R([s[1] upper]) && [s[1] isEqual: @"ABC"])
+	TEST(@"-[uppercase]", R([s[0] uppercase]) &&
+	    [s[0] isEqual: @"3𝄞1€SÄT"] &&
+	    R([s[1] uppercase]) && [s[1] isEqual: @"ABC"])
 
-	TEST(@"-[lower]", R([s[0] lower]) && [s[0] isEqual: @"3𝄞1€sät"] &&
-	    R([s[1] lower]) && [s[1] isEqual: @"abc"])
+	TEST(@"-[lowercase]", R([s[0] lowercase]) &&
+	    [s[0] isEqual: @"3𝄞1€sät"] &&
+	    R([s[1] lowercase]) && [s[1] isEqual: @"abc"])
 
 	TEST(@"-[uppercaseString]",
 	    [[s[0] uppercaseString] isEqual: @"3𝄞1€SÄT"])
 
-	TEST(@"-[lowercaseString]", R([s[0] upper]) &&
+	TEST(@"-[lowercaseString]", R([s[0] uppercase]) &&
 	    [[s[0] lowercaseString] isEqual: @"3𝄞1€sät"])
 
 	TEST(@"+[stringWithUTF8String:length:]",
 	    (s[0] = [OFMutableString stringWithUTF8String: "\xEF\xBB\xBF"
 							   "foobar"