@@ -15,22 +15,22 @@
 
 #include "config.h"
 
 #include <string.h>
 
-#import "OFMutableMapTableDictionary.h"
+#import "OFConcreteMutableDictionary.h"
+#import "OFConcreteDictionary.h"
 #import "OFMapTable.h"
-#import "OFMapTableDictionary.h"
 
 #import "OFEnumerationMutationException.h"
 #import "OFOutOfRangeException.h"
 
-@implementation OFMutableMapTableDictionary
+@implementation OFConcreteMutableDictionary
 + (void)initialize
 {
-	if (self == [OFMutableMapTableDictionary class])
-		[self inheritMethodsFromClass: [OFMapTableDictionary class]];
+	if (self == [OFConcreteMutableDictionary class])
+		[self inheritMethodsFromClass: [OFConcreteDictionary class]];
 }
 
 - (void)setObject: (id)object forKey: (id)key
 {
 	[_mapTable setObject: object forKey: key];
@@ -61,8 +61,8 @@
 }
 #endif
 
 - (void)makeImmutable
 {
-	object_setClass(self, [OFMapTableDictionary class]);
+	object_setClass(self, [OFConcreteDictionary class]);
 }
 @end