@@ -16,64 +16,64 @@
 #include "config.h"
 
 #include <stdlib.h>
 
 #import "OFMutableSet.h"
-#import "OFMutableMapTableSet.h"
+#import "OFConcreteMutableSet.h"
 #import "OFString.h"
 
 static struct {
 	Class isa;
 } placeholder;
 
-@interface OFMutableSetPlaceholder: OFMutableSet
+@interface OFPlaceholderMutableSet: OFMutableSet
 @end
 
-@implementation OFMutableSetPlaceholder
+@implementation OFPlaceholderMutableSet
 - (instancetype)init
 {
-	return (id)[[OFMutableMapTableSet alloc] init];
+	return (id)[[OFConcreteMutableSet alloc] init];
 }
 
 - (instancetype)initWithSet: (OFSet *)set
 {
-	return (id)[[OFMutableMapTableSet alloc] initWithSet: set];
+	return (id)[[OFConcreteMutableSet alloc] initWithSet: set];
 }
 
 - (instancetype)initWithArray: (OFArray *)array
 {
-	return (id)[[OFMutableMapTableSet alloc] initWithArray: array];
+	return (id)[[OFConcreteMutableSet alloc] initWithArray: array];
 }
 
 - (instancetype)initWithObjects: (id)firstObject, ...
 {
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, firstObject);
-	ret = [[OFMutableMapTableSet alloc] initWithObject: firstObject
+	ret = [[OFConcreteMutableSet alloc] initWithObject: firstObject
 						 arguments: arguments];
 	va_end(arguments);
 
 	return ret;
 }
 
 - (instancetype)initWithObjects: (id const *)objects count: (size_t)count
 {
-	return (id)[[OFMutableMapTableSet alloc] initWithObjects: objects
+	return (id)[[OFConcreteMutableSet alloc] initWithObjects: objects
 							   count: count];
 }
 
 - (instancetype)initWithObject: (id)firstObject arguments: (va_list)arguments
 {
-	return (id)[[OFMutableMapTableSet alloc] initWithObject: firstObject
+	return (id)[[OFConcreteMutableSet alloc] initWithObject: firstObject
 						      arguments: arguments];
 }
 
 - (instancetype)initWithCapacity: (size_t)capacity
 {
-	return (id)[[OFMutableMapTableSet alloc] initWithCapacity: capacity];
+	return (id)[[OFConcreteMutableSet alloc] initWithCapacity: capacity];
 }
 
 OF_SINGLETON_METHODS
 @end
 
@@ -80,11 +80,11 @@
 @implementation OFMutableSet
 + (void)initialize
 {
 	if (self == [OFMutableSet class])
 		object_setClass((id)&placeholder,
-		    [OFMutableSetPlaceholder class]);
+		    [OFPlaceholderMutableSet class]);
 }
 
 + (instancetype)alloc
 {
 	if (self == [OFMutableSet class])