@@ -329,17 +329,17 @@
 	return [[[self alloc] initWithCount: count
 		      allowsSwappableMemory: allowsSwappableMemory]
 	    autorelease];
 }
 
-+ (instancetype)dataWithItemSize: (size_t)itemSize
-			   count: (size_t)count
++ (instancetype)dataWithCount: (size_t)count
+		     itemSize: (size_t)itemSize
 	   allowsSwappableMemory: (bool)allowsSwappableMemory
 {
-	return [[[self alloc] initWithItemSize: itemSize
-					 count: count
-			 allowsSwappableMemory: allowsSwappableMemory]
+	return [[[self alloc] initWithCount: count
+				   itemSize: itemSize
+		      allowsSwappableMemory: allowsSwappableMemory]
 	    autorelease];
 }
 
 + (instancetype)dataWithItems: (const void *)items
 			count: (size_t)count
@@ -346,12 +346,12 @@
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 + (instancetype)dataWithItems: (const void *)items
-		     itemSize: (size_t)itemSize
 			count: (size_t)count
+		     itemSize: (size_t)itemSize
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 + (instancetype)dataWithItemsNoCopy: (void *)items
@@ -360,12 +360,12 @@
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
 + (instancetype)dataWithItemsNoCopy: (void *)items
-			   itemSize: (size_t)itemSize
 			      count: (size_t)count
+			   itemSize: (size_t)itemSize
 		       freeWhenDone: (bool)freeWhenDone
 {
 	OF_UNRECOGNIZED_SELECTOR
 }
 
@@ -393,18 +393,18 @@
 
 
 - (instancetype)initWithCount: (size_t)count
 	allowsSwappableMemory: (bool)allowsSwappableMemory
 {
-	return [self initWithItemSize: 1
-				count: count
-		allowsSwappableMemory: allowsSwappableMemory];
+	return [self initWithCount: count
+			  itemSize: 1
+	     allowsSwappableMemory: allowsSwappableMemory];
 }
 
-- (instancetype)initWithItemSize: (size_t)itemSize
-			   count: (size_t)count
-	   allowsSwappableMemory: (bool)allowsSwappableMemory
+- (instancetype)initWithCount: (size_t)count
+		     itemSize: (size_t)itemSize
+	allowsSwappableMemory: (bool)allowsSwappableMemory
 {
 	self = [super init];
 
 	@try {
 #if defined(HAVE_MMAP) && defined(HAVE_MLOCK) && defined(MAP_ANON)
@@ -453,12 +453,12 @@
 			@throw [OFNotImplementedException
 			    exceptionWithSelector: _cmd
 					   object: nil];
 #endif
 
-		_itemSize = itemSize;
 		_count = count;
+		_itemSize = itemSize;
 		_allowsSwappableMemory = allowsSwappableMemory;
 	} @catch (id e) {
 		[self release];
 		@throw e;
 	}
@@ -471,12 +471,12 @@
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)initWithItems: (const void *)items
-		     itemSize: (size_t)itemSize
 			count: (size_t)count
+		     itemSize: (size_t)itemSize
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)initWithItemsNoCopy: (void *)items
@@ -485,12 +485,12 @@
 {
 	OF_INVALID_INIT_METHOD
 }
 
 - (instancetype)initWithItemsNoCopy: (void *)items
-			   itemSize: (size_t)itemSize
 			      count: (size_t)count
+			   itemSize: (size_t)itemSize
 		       freeWhenDone: (bool)freeWhenDone
 {
 	OF_INVALID_INIT_METHOD
 }
 
@@ -564,12 +564,12 @@
 }
 
 - (id)copy
 {
 	OFSecureData *copy = [[OFSecureData alloc]
-		 initWithItemSize: _itemSize
-			    count: _count
+		    initWithCount: _count
+			 itemSize: _itemSize
 	    allowsSwappableMemory: _allowsSwappableMemory];
 
 	memcpy(copy.mutableItems, _items, _count * _itemSize);
 
 	return copy;
@@ -576,12 +576,12 @@
 }
 
 - (id)mutableCopy
 {
 	OFSecureData *copy = [[OFSecureData alloc]
-		 initWithItemSize: _itemSize
-			    count: _count
+		    initWithCount: _count
+			 itemSize: _itemSize
 	    allowsSwappableMemory: _allowsSwappableMemory];
 
 	memcpy(copy.mutableItems, _items, _count * _itemSize);
 
 	return copy;