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