@@ -18,69 +18,69 @@
 #include "config.h"
 
 #include <stdlib.h>
 
 #import "OFSet.h"
-#import "OFSet_hashtable.h"
-#import "OFString.h"
 #import "OFArray.h"
-#import "OFXMLElement.h"
+#import "OFMapTableSet.h"
 #import "OFNull.h"
+#import "OFString.h"
+#import "OFXMLElement.h"
 
 static struct {
 	Class isa;
 } placeholder;
 
-@interface OFSet_placeholder: OFSet
+@interface OFSetPlaceholder: OFSet
 @end
 
-@implementation OFSet_placeholder
+@implementation OFSetPlaceholder
 - (instancetype)init
 {
-	return (id)[[OFSet_hashtable alloc] init];
+	return (id)[[OFMapTableSet alloc] init];
 }
 
 - (instancetype)initWithSet: (OFSet *)set
 {
-	return (id)[[OFSet_hashtable alloc] initWithSet: set];
+	return (id)[[OFMapTableSet alloc] initWithSet: set];
 }
 
 - (instancetype)initWithArray: (OFArray *)array
 {
-	return (id)[[OFSet_hashtable alloc] initWithArray: array];
+	return (id)[[OFMapTableSet alloc] initWithArray: array];
 }
 
 - (instancetype)initWithObjects: (id)firstObject, ...
 {
 	id ret;
 	va_list arguments;
 
 	va_start(arguments, firstObject);
-	ret = [[OFSet_hashtable alloc] initWithObject: firstObject
-					    arguments: arguments];
+	ret = [[OFMapTableSet alloc] initWithObject: firstObject
+					  arguments: arguments];
 	va_end(arguments);
 
 	return ret;
 }
 
 - (instancetype)initWithObjects: (id const *)objects
 			  count: (size_t)count
 {
-	return (id)[[OFSet_hashtable alloc] initWithObjects: objects
-						      count: count];
+	return (id)[[OFMapTableSet alloc] initWithObjects: objects
+						    count: count];
 }
 
 - (instancetype)initWithObject: (id)firstObject
 		     arguments: (va_list)arguments
 {
-	return (id)[[OFSet_hashtable alloc] initWithObject: firstObject
-						 arguments: arguments];
+	return (id)[[OFMapTableSet alloc] initWithObject: firstObject
+					       arguments: arguments];
 }
 
 - (instancetype)initWithSerialization: (OFXMLElement *)element
 {
-	return (id)[[OFSet_hashtable alloc] initWithSerialization: element];
+	return (id)[[OFMapTableSet alloc] initWithSerialization: element];
 }
 
 - (instancetype)retain
 {
 	return self;
@@ -103,11 +103,11 @@
 
 @implementation OFSet
 + (void)initialize
 {
 	if (self == [OFSet class])
-		placeholder.isa = [OFSet_placeholder class];
+		placeholder.isa = [OFSetPlaceholder class];
 }
 
 + (instancetype)alloc
 {
 	if (self == [OFSet class])