@@ -18,12 +18,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <limits.h>
 
 #import "OFData.h"
+#import "OFAdjacentData.h"
 #import "OFBase64.h"
-#import "OFConcreteData.h"
 #import "OFDictionary.h"
 #ifdef OF_HAVE_FILES
 # import "OFFile.h"
 # import "OFFileManager.h"
 #endif
@@ -57,73 +57,73 @@
 }
 
 @implementation OFDataPlaceholder
 - (instancetype)init
 {
-	return (id)[[OFConcreteData alloc] init];
+	return (id)[[OFAdjacentData alloc] init];
 }
 
 - (instancetype)initWithItemSize: (size_t)itemSize
 {
-	return (id)[[OFConcreteData alloc] initWithItemSize: itemSize];
+	return (id)[[OFAdjacentData alloc] initWithItemSize: itemSize];
 }
 
 - (instancetype)initWithItems: (const void *)items count: (size_t)count
 {
-	return (id)[[OFConcreteData alloc] initWithItems: items count: count];
+	return (id)[[OFAdjacentData alloc] initWithItems: items count: count];
 }
 
 - (instancetype)initWithItems: (const void *)items
 			count: (size_t)count
 		     itemSize: (size_t)itemSize
 {
-	return (id)[[OFConcreteData alloc] initWithItems: items
+	return (id)[[OFAdjacentData alloc] initWithItems: items
 						   count: count
 						itemSize: itemSize];
 }
 
 - (instancetype)initWithItemsNoCopy: (void *)items
 			      count: (size_t)count
 		       freeWhenDone: (bool)freeWhenDone
 {
-	return (id)[[OFConcreteData alloc] initWithItemsNoCopy: items
+	return (id)[[OFAdjacentData alloc] initWithItemsNoCopy: items
 							 count: count
 						  freeWhenDone: freeWhenDone];
 }
 
 - (instancetype)initWithItemsNoCopy: (void *)items
 			      count: (size_t)count
 			   itemSize: (size_t)itemSize
 		       freeWhenDone: (bool)freeWhenDone
 {
-	return (id)[[OFConcreteData alloc] initWithItemsNoCopy: items
+	return (id)[[OFAdjacentData alloc] initWithItemsNoCopy: items
 							 count: count
 						      itemSize: itemSize
 						  freeWhenDone: freeWhenDone];
 }
 
 #ifdef OF_HAVE_FILES
 - (instancetype)initWithContentsOfFile: (OFString *)path
 {
-	return (id)[[OFConcreteData alloc] initWithContentsOfFile: path];
+	return (id)[[OFAdjacentData alloc] initWithContentsOfFile: path];
 }
 #endif
 
 - (instancetype)initWithContentsOfIRI: (OFIRI *)IRI
 {
-	return (id)[[OFConcreteData alloc] initWithContentsOfIRI: IRI];
+	return (id)[[OFAdjacentData alloc] initWithContentsOfIRI: IRI];
 }
 
 - (instancetype)initWithStringRepresentation: (OFString *)string
 {
-	return (id)[[OFConcreteData alloc]
+	return (id)[[OFAdjacentData alloc]
 	    initWithStringRepresentation: string];
 }
 
 - (instancetype)initWithBase64EncodedString: (OFString *)string
 {
-	return (id)[[OFConcreteData alloc] initWithBase64EncodedString: string];
+	return (id)[[OFAdjacentData alloc] initWithBase64EncodedString: string];
 }
 @end
 
 @implementation OFData
 + (void)initialize