@@ -21,11 +21,11 @@
 
 #include <stdlib.h>
 #include <string.h>
 
 #import "OFConstantString.h"
-#import "OFString_UTF8.h"
+#import "OFUTF8String.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFInvalidEncodingException.h"
 #import "OFOutOfMemoryException.h"
 
@@ -43,14 +43,14 @@
 	const char *iVarLayout;
 	struct class_ext *ext;
 } _OFConstantStringClassReference;
 #endif
 
-@interface OFString_const: OFString_UTF8
+@interface OFConstantUTF8String: OFUTF8String
 @end
 
-@implementation OFString_const
+@implementation OFConstantUTF8String
 + (instancetype)alloc
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
@@ -137,11 +137,11 @@
 - (void)finishInitialization
 {
 	@synchronized (self) {
 		struct of_string_utf8_ivars *ivars;
 
-		if ([self isMemberOfClass: [OFString_const class]])
+		if ([self isMemberOfClass: [OFConstantUTF8String class]])
 			return;
 
 		if ((ivars = calloc(1, sizeof(*ivars))) == NULL)
 			@throw [OFOutOfMemoryException
 			    exceptionWithRequestedSize: sizeof(*ivars)];
@@ -159,11 +159,11 @@
 				free(ivars);
 				@throw [OFInvalidEncodingException exception];
 		}
 
 		_cString = (char *)ivars;
-		object_setClass(self, [OFString_const class]);
+		object_setClass(self, [OFConstantUTF8String class]);
 	}
 }
 
 + (instancetype)alloc
 {
@@ -223,11 +223,11 @@
 	OF_DEALLOC_UNSUPPORTED
 }
 
 /*
  * In all following methods, the constant string is converted to an
- * OFString_UTF8 and the message sent again.
+ * OFUTF8String and the message sent again.
  */
 
 /* From protocol OFCopying */
 - (id)copy
 {