@@ -21,14 +21,14 @@
 #import "OFConcreteColor.h"
 #import "OFOnce.h"
 #import "OFString.h"
 #import "OFTaggedPointerColor.h"
 
-@interface OFColorSingleton: OFConcreteColor
+@interface OFPlaceholderColor: OFColor
 @end
 
-@interface OFPlaceholderColor: OFColor
+@interface OFConcreteColorSingleton: OFConcreteColor
 @end
 
 static struct {
 	Class isa;
 } placeholder;
@@ -67,11 +67,11 @@
 }
 
 OF_SINGLETON_METHODS
 @end
 
-@implementation OFColorSingleton
+@implementation OFConcreteColorSingleton
 OF_SINGLETON_METHODS
 @end
 
 @implementation OFColor
 + (void)initialize
@@ -92,11 +92,11 @@
 	static OFColor *name##Color = nil;				   \
 									   \
 	static void							   \
 	initPredefinedColor_##name(void)				   \
 	{								   \
-		name##Color = [[OFColorSingleton alloc]			   \
+		name##Color = [[OFConcreteColorSingleton alloc]		   \
 		    initWithRed: redValue				   \
 			  green: greenValue				   \
 			   blue: blueValue				   \
 			  alpha: 1];					   \
 	}								   \