@@ -13,16 +13,16 @@
  * file.
  */
 
 #include "config.h"
 
-#import "OFMapTableSet.h"
+#import "OFConcreteSet.h"
 #import "OFArray.h"
-#import "OFCountedMapTableSet.h"
-#import "OFMapTable.h"
+#import "OFConcreteCountedSet.h"
+#import "OFConcreteMutableSet.h"
 #import "OFMapTable+Private.h"
-#import "OFMutableMapTableSet.h"
+#import "OFMapTable.h"
 #import "OFString.h"
 
 #import "OFInvalidArgumentException.h"
 #import "OFEnumerationMutationException.h"
 
@@ -56,11 +56,11 @@
 	.hash = hash,
 	.equal = equal
 };
 static const OFMapTableFunctions objectFunctions = { NULL };
 
-@implementation OFMapTableSet
+@implementation OFConcreteSet
 - (instancetype)init
 {
 	return [self initWithCapacity: 0];
 }
 
@@ -200,18 +200,18 @@
 	return ([_mapTable objectForKey: object] != nil);
 }
 
 - (bool)isEqual: (id)object
 {
-	OFMapTableSet *set;
+	OFConcreteSet *set;
 
 	if (object == self)
 		return true;
 
-	if (![object isKindOfClass: [OFMapTableSet class]] &&
-	    ![object isKindOfClass: [OFMutableMapTableSet class]] &&
-	    ![object isKindOfClass: [OFCountedMapTableSet class]])
+	if (![object isKindOfClass: [OFConcreteSet class]] &&
+	    ![object isKindOfClass: [OFConcreteMutableSet class]] &&
+	    ![object isKindOfClass: [OFConcreteCountedSet class]])
 		return [super isEqual: object];
 
 	set = object;
 
 	return [set->_mapTable isEqual: _mapTable];