@@ -380,11 +380,11 @@
 	string[nlen] = '\0';
 
 	length = nlen;
 }
 
-- (void)removeCharactersFromIndex: (size_t)start
+- (void)deleteCharactersFromIndex: (size_t)start
 			  toIndex: (size_t)end
 {
 	if (isUTF8) {
 		start = of_string_index_to_position(string, start, length);
 		end = of_string_index_to_position(string, end, length);
@@ -408,13 +408,13 @@
 		/* We don't really care, as we only made it smaller */
 		[e release];
 	}
 }
 
-- (void)removeCharactersInRange: (of_range_t)range
+- (void)deleteCharactersInRange: (of_range_t)range
 {
-	[self removeCharactersFromIndex: range.start
+	[self deleteCharactersFromIndex: range.start
 				toIndex: range.start + range.length];
 }
 
 - (void)replaceCharactersFromIndex: (size_t)start
 			   toIndex: (size_t)end
@@ -503,11 +503,11 @@
 	[self freeMemory: string];
 	string = tmp;
 	length = tmp_len;
 }
 
-- (void)removeLeadingWhitespaces
+- (void)deleteLeadingWhitespaces
 {
 	size_t i;
 
 	for (i = 0; i < length; i++)
 		if (string[i] != ' '  && string[i] != '\t' &&
@@ -525,11 +525,11 @@
 		/* We don't really care, as we only made it smaller */
 		[e release];
 	}
 }
 
-- (void)removeTrailingWhitespaces
+- (void)deleteTrailingWhitespaces
 {
 	size_t d;
 	char *p;
 
 	d = 0;
@@ -550,11 +550,11 @@
 		/* We don't really care, as we only made it smaller */
 		[e release];
 	}
 }
 
-- (void)removeLeadingAndTrailingWhitespaces
+- (void)deleteLeadingAndTrailingWhitespaces
 {
 	size_t d, i;
 	char *p;
 
 	d = 0;