@@ -44,11 +44,11 @@
 
 static struct {
 	Class isa;
 } placeholder;
 
-@interface OFDataPlaceholder: OFString
+@interface OFPlaceholderData: OFString
 @end
 
 /* References for static linking */
 void
 _references_to_categories_of_OFData(void)
@@ -55,11 +55,11 @@
 {
 	_OFData_CryptographicHashing_reference = 1;
 	_OFData_MessagePackParsing_reference = 1;
 }
 
-@implementation OFDataPlaceholder
+@implementation OFPlaceholderData
 - (instancetype)init
 {
 	return (id)[[OFConcreteData alloc] init];
 }
 
@@ -130,11 +130,11 @@
 
 @implementation OFData
 + (void)initialize
 {
 	if (self == [OFData class])
-		object_setClass((id)&placeholder, [OFDataPlaceholder class]);
+		object_setClass((id)&placeholder, [OFPlaceholderData class]);
 }
 
 + (instancetype)alloc
 {
 	if (self == [OFData class])