@@ -15,21 +15,21 @@
 
 #include "config.h"
 
 #include <stdarg.h>
 
-#import "OFAdjacentArray.h"
-#import "OFAdjacentSubarray.h"
+#import "OFConcreteArray.h"
+#import "OFConcreteMutableArray.h"
+#import "OFConcreteSubarray.h"
 #import "OFData.h"
-#import "OFMutableAdjacentArray.h"
 #import "OFString.h"
 
 #import "OFEnumerationMutationException.h"
 #import "OFInvalidArgumentException.h"
 #import "OFOutOfRangeException.h"
 
-@implementation OFAdjacentArray
+@implementation OFConcreteArray
 - (instancetype)init
 {
 	self = [super init];
 
 	@try {
@@ -231,11 +231,11 @@
 	if ([self isKindOfClass: [OFMutableArray class]])
 		return [OFArray
 		    arrayWithObjects: (id *)_array.items + range.location
 			       count: range.length];
 
-	return [[[OFAdjacentSubarray alloc] initWithArray: self
+	return [[[OFConcreteSubarray alloc] initWithArray: self
 						    range: range] autorelease];
 }
 
 - (bool)isEqual: (id)object
 {
@@ -244,12 +244,12 @@
 	size_t count;
 
 	if (object == self)
 		return true;
 
-	if (![object isKindOfClass: [OFAdjacentArray class]] &&
-	    ![object isKindOfClass: [OFMutableAdjacentArray class]])
+	if (![object isKindOfClass: [OFConcreteArray class]] &&
+	    ![object isKindOfClass: [OFConcreteMutableArray class]])
 		return [super isEqual: object];
 
 	otherArray = object;
 
 	count = _array.count;