Index: src/OFConstantString.h
==================================================================
--- src/OFConstantString.h
+++ src/OFConstantString.h
@@ -31,10 +31,10 @@
  */
 @interface OFConstantString: OFString
 /**
  * \brief Completes initialization of the OFConstantString
  *
- * This method completes the initialization, as the constant strings created by
+ * This method finishes the initialization, as the constant strings created by
  * the compiler are not fully initialized.
  */
-- (void)completeInitialization;
+- (void)finishInitialization;
 @end

Index: src/OFConstantString.m
==================================================================
--- src/OFConstantString.m
+++ src/OFConstantString.m
@@ -38,11 +38,11 @@
 	objc_setFutureClass((Class)&_OFConstantStringClassReference,
 	    "OFConstantString");
 }
 #endif
 
-- (void)completeInitialization
+- (void)finishInitialization
 {
 	struct of_string_ivars *ivars;
 
 	if (initialized == SIZE_MAX)
 		return;
@@ -354,288 +354,288 @@
 
 /* From protocol OFCopying */
 - copy
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super copy];
 }
 
 /* From protocol OFMutableCopying */
 - mutableCopy
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super mutableCopy];
 }
 
 /* From protocol OFComparing */
 - (of_comparison_result_t)compare: (id)object
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super compare: object];
 }
 
 /* From OFObject, but reimplemented in OFString */
 - (BOOL)isEqual: (id)object
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super isEqual: object];
 }
 
 - (uint32_t)hash
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super hash];
 }
 
 - (OFString*)description
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super description];
 }
 
 /* From OFString */
 - (const char*)cString
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super cString];
 }
 
 - (size_t)length
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super length];
 }
 
 - (size_t)cStringLength
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super cStringLength];
 }
 
 - (of_comparison_result_t)caseInsensitiveCompare: (OFString*)otherString
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super caseInsensitiveCompare: otherString];
 }
 
 - (of_unichar_t)characterAtIndex: (size_t)index
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super characterAtIndex: index];
 }
 
 - (size_t)indexOfFirstOccurrenceOfString: (OFString*)string
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super indexOfFirstOccurrenceOfString: string];
 }
 
 - (size_t)indexOfLastOccurrenceOfString: (OFString*)string
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super indexOfLastOccurrenceOfString: string];
 }
 
 - (BOOL)containsString: (OFString*)string
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super containsString: string];
 }
 
 - (OFString*)substringFromIndex: (size_t)start
 			toIndex: (size_t)end
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super substringFromIndex: start
 				 toIndex: end];
 }
 
 - (OFString*)substringWithRange: (of_range_t)range
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super substringWithRange: range];
 }
 
 - (OFString*)stringByAppendingString: (OFString*)string
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super stringByAppendingString: string];
 }
 
 - (OFString*)stringByPrependingString: (OFString*)string
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super stringByPrependingString: string];
 }
 
 - (OFString*)uppercaseString
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super uppercaseString];
 }
 
 - (OFString*)lowercaseString
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super lowercaseString];
 }
 
 - (OFString*)stringByDeletingLeadingWhitespaces
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super stringByDeletingLeadingWhitespaces];
 }
 
 - (OFString*)stringByDeletingTrailingWhitespaces
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super stringByDeletingTrailingWhitespaces];
 }
 
 - (OFString*)stringByDeletingEnclosingWhitespaces
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super stringByDeletingEnclosingWhitespaces];
 }
 
 - (BOOL)hasPrefix: (OFString*)prefix
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super hasPrefix: prefix];
 }
 
 - (BOOL)hasSuffix: (OFString*)suffix
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super hasSuffix: suffix];
 }
 
 - (OFArray*)componentsSeparatedByString: (OFString*)delimiter
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super componentsSeparatedByString: delimiter];
 }
 
 - (OFArray*)pathComponents
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super pathComponents];
 }
 
 - (OFString*)lastPathComponent
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super lastPathComponent];
 }
 
 - (OFString*)stringByDeletingLastPathComponent
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super stringByDeletingLastPathComponent];
 }
 
 - (intmax_t)decimalValue
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super decimalValue];
 }
 
 - (uintmax_t)hexadecimalValue
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super hexadecimalValue];
 }
 
 - (float)floatValue
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super floatValue];
 }
 
 - (double)doubleValue
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super doubleValue];
 }
 
 - (of_unichar_t*)unicodeString
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super unicodeString];
 }
 
 - (void)writeToFile: (OFString*)path
 {
 	if (initialized != SIZE_MAX)
-		[self completeInitialization];
+		[self finishInitialization];
 
 	return [super writeToFile: path];
 }
 @end