@@ -95,11 +95,11 @@
 - (OFString *)
     of_JSONRepresentationWithOptions: (OFJSONRepresentationOptions)options
 			       depth: (size_t)depth;
 @end
 
-@interface OFStringPlaceholder: OFString
+@interface OFPlaceholderString: OFString
 @end
 
 extern bool OFUnicodeToISO8859_2(const OFUnichar *, unsigned char *,
     size_t, bool);
 extern bool OFUnicodeToISO8859_3(const OFUnichar *, unsigned char *,
@@ -375,11 +375,11 @@
 
 	return ret;
 }
 #endif
 
-@implementation OFStringPlaceholder
+@implementation OFPlaceholderString
 - (instancetype)init
 {
 	return (id)[[OFUTF8String alloc] init];
 }
 
@@ -599,11 +599,11 @@
 + (void)initialize
 {
 	if (self != [OFString class])
 		return;
 
-	object_setClass((id)&placeholder, [OFStringPlaceholder class]);
+	object_setClass((id)&placeholder, [OFPlaceholderString class]);
 
 #if defined(HAVE_STRTOF_L) || defined(HAVE_STRTOD_L) || defined(HAVE_USELOCALE)
 	if ((cLocale = newlocale(LC_ALL_MASK, "C", NULL)) == NULL)
 		@throw [OFInitializationFailedException
 		    exceptionWithClass: self];