@@ -13,15 +13,15 @@
  * file.
  */
 
 #include "config.h"
 
-#import "OFMapTableDictionary.h"
+#import "OFConcreteDictionary.h"
 #import "OFArray.h"
+#import "OFConcreteMutableDictionary.h"
 #import "OFMapTable+Private.h"
 #import "OFMapTable.h"
-#import "OFMutableMapTableDictionary.h"
 #import "OFString.h"
 
 #import "OFEnumerationMutationException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFInvalidFormatException.h"
@@ -67,11 +67,11 @@
 	.release = release,
 	.hash = hash,
 	.equal = equal
 };
 
-@implementation OFMapTableDictionary
+@implementation OFConcreteDictionary
 - (instancetype)init
 {
 	return [self initWithCapacity: 0];
 }
 
@@ -97,17 +97,17 @@
 	size_t count;
 
 	if (dictionary == nil)
 		return [self init];
 
-	if ([dictionary isKindOfClass: [OFMapTableDictionary class]] ||
-	    [dictionary isKindOfClass: [OFMutableMapTableDictionary class]]) {
+	if ([dictionary isKindOfClass: [OFConcreteDictionary class]] ||
+	    [dictionary isKindOfClass: [OFConcreteMutableDictionary class]]) {
 		self = [super init];
 
 		@try {
-			OFMapTableDictionary *dictionary_ =
-			    (OFMapTableDictionary *)dictionary;
+			OFConcreteDictionary *dictionary_ =
+			    (OFConcreteDictionary *)dictionary;
 
 			_mapTable = [dictionary_->_mapTable copy];
 		} @catch (id e) {
 			[self release];
 			@throw e;
@@ -246,20 +246,20 @@
 	return _mapTable.count;
 }
 
 - (bool)isEqual: (id)object
 {
-	OFMapTableDictionary *dictionary;
+	OFConcreteDictionary *dictionary;
 
 	if (object == self)
 		return true;
 
-	if (![object isKindOfClass: [OFMapTableDictionary class]] &&
-	    ![object isKindOfClass: [OFMutableMapTableDictionary class]])
+	if (![object isKindOfClass: [OFConcreteDictionary class]] &&
+	    ![object isKindOfClass: [OFConcreteMutableDictionary class]])
 		return [super isEqual: object];
 
-	dictionary = (OFMapTableDictionary *)object;
+	dictionary = (OFConcreteDictionary *)object;
 
 	return [dictionary->_mapTable isEqual: _mapTable];
 }
 
 - (bool)containsObject: (id)object