@@ -24,11 +24,11 @@
 #import "OFCountedSet.h"
 #import "OFList.h"
 #import "OFNumber.h"
 #import "OFDate.h"
 #import "OFURL.h"
-#import "OFDataArray.h"
+#import "OFData.h"
 #import "OFAutoreleasePool.h"
 #import "OFXMLElement.h"
 
 #import "TestsAppDelegate.h"
 
@@ -39,11 +39,11 @@
 {
 	OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
 	OFMutableDictionary *d = [OFMutableDictionary dictionary];
 	OFMutableArray *a = [OFMutableArray array];
 	OFList *l = [OFList list];
-	OFDataArray *da = [OFDataArray dataArray];
+	OFData *data;
 	OFString *s;
 
 	[a addObject: @"Qu\"xbar\ntest"];
 	[a addObject: [OFNumber numberWithInt: 1234]];
 	[a addObject: [OFNumber numberWithDouble: 1234.5678]];
@@ -65,14 +65,14 @@
 	    [OFCountedSet setWithObjects: @"foo", @"foo", @"bar", nil]];
 
 	[d setObject: @"list"
 	      forKey: l];
 
-	[da addItems: "0123456789:;<ABCDEFGHJIKLMNOPQRSTUVWXYZ"
-	       count: 39];
+	data = [OFData dataWithItems: "0123456789:;<ABCDEFGHJIKLMNOPQRSTUVWXYZ"
+			       count: 39];
 	[d setObject: @"data"
-	      forKey: da];
+	      forKey: data];
 
 	TEST(@"-[stringBySerializing]",
 	    (s = [d stringBySerializing]) && [s isEqual:
 	    [OFString stringWithContentsOfFile: @"serialization.xml"]])