@@ -249,93 +249,93 @@
 
 	return OF_BSWAP_DOUBLE_IF_LE(ret);
 }
 
 - (size_t)readBigEndianInt16sIntoBuffer: (uint16_t*)buffer
-				  count: (size_t)nInt16s
+				  count: (size_t)count
 {
-	size_t size = nInt16s * sizeof(uint16_t);
+	size_t size = count * sizeof(uint16_t);
 
 	[self readIntoBuffer: buffer
 		 exactLength: size];
 
 #ifndef OF_BIG_ENDIAN
 	size_t i;
 
-	for (i = 0; i < nInt16s; i++)
+	for (i = 0; i < count; i++)
 		buffer[i] = OF_BSWAP16(buffer[i]);
 #endif
 
 	return size;
 }
 
 - (size_t)readBigEndianInt32sIntoBuffer: (uint32_t*)buffer
-				  count: (size_t)nInt32s
+				  count: (size_t)count
 {
-	size_t size = nInt32s * sizeof(uint32_t);
+	size_t size = count * sizeof(uint32_t);
 
 	[self readIntoBuffer: buffer
 		 exactLength: size];
 
 #ifndef OF_BIG_ENDIAN
 	size_t i;
 
-	for (i = 0; i < nInt32s; i++)
+	for (i = 0; i < count; i++)
 		buffer[i] = OF_BSWAP32(buffer[i]);
 #endif
 
 	return size;
 }
 
 - (size_t)readBigEndianInt64sIntoBuffer: (uint64_t*)buffer
-				  count: (size_t)nInt64s
+				  count: (size_t)count
 {
-	size_t size = nInt64s * sizeof(uint64_t);
+	size_t size = count * sizeof(uint64_t);
 
 	[self readIntoBuffer: buffer
 		 exactLength: size];
 
 #ifndef OF_BIG_ENDIAN
 	size_t i;
 
-	for (i = 0; i < nInt64s; i++)
+	for (i = 0; i < count; i++)
 		buffer[i] = OF_BSWAP64(buffer[i]);
 #endif
 
 	return size;
 }
 
 - (size_t)readBigEndianFloatsIntoBuffer: (float*)buffer
-				  count: (size_t)nFloats
+				  count: (size_t)count
 {
-	size_t size = nFloats * sizeof(float);
+	size_t size = count * sizeof(float);
 
 	[self readIntoBuffer: buffer
 		 exactLength: size];
 
 #ifndef OF_FLOAT_BIG_ENDIAN
 	size_t i;
 
-	for (i = 0; i < nFloats; i++)
+	for (i = 0; i < count; i++)
 		buffer[i] = OF_BSWAP_FLOAT(buffer[i]);
 #endif
 
 	return size;
 }
 
 - (size_t)readBigEndianDoublesIntoBuffer: (double*)buffer
-				   count: (size_t)nDoubles
+				   count: (size_t)count
 {
-	size_t size = nDoubles * sizeof(double);
+	size_t size = count * sizeof(double);
 
 	[self readIntoBuffer: buffer
 		 exactLength: size];
 
 #ifndef OF_FLOAT_BIG_ENDIAN
 	size_t i;
 
-	for (i = 0; i < nDoubles; i++)
+	for (i = 0; i < count; i++)
 		buffer[i] = OF_BSWAP_DOUBLE(buffer[i]);
 #endif
 
 	return size;
 }
@@ -389,121 +389,121 @@
 
 	return OF_BSWAP_DOUBLE_IF_BE(ret);
 }
 
 - (size_t)readLittleEndianInt16sIntoBuffer: (uint16_t*)buffer
-				     count: (size_t)nInt16s
+				     count: (size_t)count
 {
-	size_t size = nInt16s * sizeof(uint16_t);
+	size_t size = count * sizeof(uint16_t);
 
 	[self readIntoBuffer: buffer
 		 exactLength: size];
 
 #ifdef OF_BIG_ENDIAN
 	size_t i;
 
-	for (i = 0; i < nInt16s; i++)
+	for (i = 0; i < count; i++)
 		buffer[i] = OF_BSWAP16(buffer[i]);
 #endif
 
 	return size;
 }
 
 - (size_t)readLittleEndianInt32sIntoBuffer: (uint32_t*)buffer
-				     count: (size_t)nInt32s
+				     count: (size_t)count
 {
-	size_t size = nInt32s * sizeof(uint32_t);
+	size_t size = count * sizeof(uint32_t);
 
 	[self readIntoBuffer: buffer
 		 exactLength: size];
 
 #ifdef OF_BIG_ENDIAN
 	size_t i;
 
-	for (i = 0; i < nInt32s; i++)
+	for (i = 0; i < count; i++)
 		buffer[i] = OF_BSWAP32(buffer[i]);
 #endif
 
 	return size;
 }
 
 - (size_t)readLittleEndianInt64sIntoBuffer: (uint64_t*)buffer
-				     count: (size_t)nInt64s
+				     count: (size_t)count
 {
-	size_t size = nInt64s * sizeof(uint64_t);
+	size_t size = count * sizeof(uint64_t);
 
 	[self readIntoBuffer: buffer
 		 exactLength: size];
 
 #ifdef OF_BIG_ENDIAN
 	size_t i;
 
-	for (i = 0; i < nInt64s; i++)
+	for (i = 0; i < count; i++)
 		buffer[i] = OF_BSWAP64(buffer[i]);
 #endif
 
 	return size;
 }
 
 - (size_t)readLittleEndianFloatsIntoBuffer: (float*)buffer
-				     count: (size_t)nFloats
+				     count: (size_t)count
 {
-	size_t size = nFloats * sizeof(float);
+	size_t size = count * sizeof(float);
 
 	[self readIntoBuffer: buffer
 		 exactLength: size];
 
 #ifdef OF_FLOAT_BIG_ENDIAN
 	size_t i;
 
-	for (i = 0; i < nFloats; i++)
+	for (i = 0; i < count; i++)
 		buffer[i] = OF_BSWAP_FLOAT(buffer[i]);
 #endif
 
 	return size;
 }
 
 - (size_t)readLittleEndianDoublesIntoBuffer: (double*)buffer
-				      count: (size_t)nDoubles
+				      count: (size_t)count
 {
-	size_t size = nDoubles * sizeof(double);
+	size_t size = count * sizeof(double);
 
 	[self readIntoBuffer: buffer
 		 exactLength: size];
 
 #ifdef OF_FLOAT_BIG_ENDIAN
 	size_t i;
 
-	for (i = 0; i < nDoubles; i++)
+	for (i = 0; i < count; i++)
 		buffer[i] = OF_BSWAP_DOUBLE(buffer[i]);
 #endif
 
 	return size;
 }
 
-- (OFDataArray*)readDataArrayWithSize: (size_t)nItems
+- (OFDataArray*)readDataArrayWithSize: (size_t)size
 {
 	return [self readDataArrayWithItemSize: 1
-					 count: nItems];
+					 count: size];
 }
 
 - (OFDataArray*)readDataArrayWithItemSize: (size_t)itemSize
-				    count: (size_t)nItems
+				    count: (size_t)count
 {
 	OFDataArray *dataArray;
 	char *tmp;
 
 	dataArray = [OFDataArray dataArrayWithItemSize: itemSize];
 	tmp = [self allocMemoryWithSize: itemSize
-				  count: nItems];
+				  count: count];
 
 	@try {
 		[self readIntoBuffer: tmp
-			 exactLength: nItems * itemSize];
+			 exactLength: count * itemSize];
 
 		[dataArray addItemsFromCArray: tmp
-					count: nItems];
+					count: count];
 	} @finally {
 		[self freeMemory: tmp];
 	}
 
 	return dataArray;
@@ -1012,27 +1012,27 @@
 	[self writeBuffer: (char*)&double_
 		   length: 8];
 }
 
 - (size_t)writeBigEndianInt16s: (const uint16_t*)buffer
-			 count: (size_t)nInt16s
+			 count: (size_t)count
 {
-	size_t size = nInt16s * sizeof(uint16_t);
+	size_t size = count * sizeof(uint16_t);
 
 #ifdef OF_BIG_ENDIAN
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint16_t *tmp;
 
 	tmp = [self allocMemoryWithSize: sizeof(uint16_t)
-				  count: nInt16s];
+				  count: count];
 
 	@try {
 		size_t i;
 
-		for (i = 0; i < nInt16s; i++)
+		for (i = 0; i < count; i++)
 			tmp[i] = OF_BSWAP16(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
@@ -1042,27 +1042,27 @@
 
 	return size;
 }
 
 - (size_t)writeBigEndianInt32s: (const uint32_t*)buffer
-			 count: (size_t)nInt32s
+			 count: (size_t)count
 {
-	size_t size = nInt32s * sizeof(uint32_t);
+	size_t size = count * sizeof(uint32_t);
 
 #ifdef OF_BIG_ENDIAN
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint32_t *tmp;
 
 	tmp = [self allocMemoryWithSize: sizeof(uint32_t)
-				  count: nInt32s];
+				  count: count];
 
 	@try {
 		size_t i;
 
-		for (i = 0; i < nInt32s; i++)
+		for (i = 0; i < count; i++)
 			tmp[i] = OF_BSWAP32(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
@@ -1072,27 +1072,27 @@
 
 	return size;
 }
 
 - (size_t)writeBigEndianInt64s: (const uint64_t*)buffer
-			 count: (size_t)nInt64s
+			 count: (size_t)count
 {
-	size_t size = nInt64s * sizeof(uint64_t);
+	size_t size = count * sizeof(uint64_t);
 
 #ifdef OF_BIG_ENDIAN
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint64_t *tmp;
 
 	tmp = [self allocMemoryWithSize: sizeof(uint64_t)
-				  count: nInt64s];
+				  count: count];
 
 	@try {
 		size_t i;
 
-		for (i = 0; i < nInt64s; i++)
+		for (i = 0; i < count; i++)
 			tmp[i] = OF_BSWAP64(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
@@ -1102,27 +1102,27 @@
 
 	return size;
 }
 
 - (size_t)writeBigEndianFloats: (const float*)buffer
-			 count: (size_t)nFloats
+			 count: (size_t)count
 {
-	size_t size = nFloats * sizeof(float);
+	size_t size = count * sizeof(float);
 
 #ifdef OF_FLOAT_BIG_ENDIAN
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	float *tmp;
 
 	tmp = [self allocMemoryWithSize: sizeof(float)
-				  count: nFloats];
+				  count: count];
 
 	@try {
 		size_t i;
 
-		for (i = 0; i < nFloats; i++)
+		for (i = 0; i < count; i++)
 			tmp[i] = OF_BSWAP_FLOAT(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
@@ -1132,27 +1132,27 @@
 
 	return size;
 }
 
 - (size_t)writeBigEndianDoubles: (const double*)buffer
-			  count: (size_t)nDoubles
+			  count: (size_t)count
 {
-	size_t size = nDoubles * sizeof(double);
+	size_t size = count * sizeof(double);
 
 #ifdef OF_FLOAT_BIG_ENDIAN
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	double *tmp;
 
 	tmp = [self allocMemoryWithSize: sizeof(double)
-				  count: nDoubles];
+				  count: count];
 
 	@try {
 		size_t i;
 
-		for (i = 0; i < nDoubles; i++)
+		for (i = 0; i < count; i++)
 			tmp[i] = OF_BSWAP_DOUBLE(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
@@ -1202,27 +1202,27 @@
 	[self writeBuffer: (char*)&double_
 		   length: 8];
 }
 
 - (size_t)writeLittleEndianInt16s: (const uint16_t*)buffer
-			    count: (size_t)nInt16s
+			    count: (size_t)count
 {
-	size_t size = nInt16s * sizeof(uint16_t);
+	size_t size = count * sizeof(uint16_t);
 
 #ifndef OF_BIG_ENDIAN
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint16_t *tmp;
 
 	tmp = [self allocMemoryWithSize: sizeof(uint16_t)
-				  count: nInt16s];
+				  count: count];
 
 	@try {
 		size_t i;
 
-		for (i = 0; i < nInt16s; i++)
+		for (i = 0; i < count; i++)
 			tmp[i] = OF_BSWAP16(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
@@ -1232,27 +1232,27 @@
 
 	return size;
 }
 
 - (size_t)writeLittleEndianInt32s: (const uint32_t*)buffer
-			    count: (size_t)nInt32s
+			    count: (size_t)count
 {
-	size_t size = nInt32s * sizeof(uint32_t);
+	size_t size = count * sizeof(uint32_t);
 
 #ifndef OF_BIG_ENDIAN
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint32_t *tmp;
 
 	tmp = [self allocMemoryWithSize: sizeof(uint32_t)
-				  count: nInt32s];
+				  count: count];
 
 	@try {
 		size_t i;
 
-		for (i = 0; i < nInt32s; i++)
+		for (i = 0; i < count; i++)
 			tmp[i] = OF_BSWAP32(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
@@ -1262,27 +1262,27 @@
 
 	return size;
 }
 
 - (size_t)writeLittleEndianInt64s: (const uint64_t*)buffer
-			    count: (size_t)nInt64s
+			    count: (size_t)count
 {
-	size_t size = nInt64s * sizeof(uint64_t);
+	size_t size = count * sizeof(uint64_t);
 
 #ifndef OF_BIG_ENDIAN
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	uint64_t *tmp;
 
 	tmp = [self allocMemoryWithSize: sizeof(uint64_t)
-				  count: nInt64s];
+				  count: count];
 
 	@try {
 		size_t i;
 
-		for (i = 0; i < nInt64s; i++)
+		for (i = 0; i < count; i++)
 			tmp[i] = OF_BSWAP64(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
@@ -1292,27 +1292,27 @@
 
 	return size;
 }
 
 - (size_t)writeLittleEndianFloats: (const float*)buffer
-			    count: (size_t)nFloats
+			    count: (size_t)count
 {
-	size_t size = nFloats * sizeof(float);
+	size_t size = count * sizeof(float);
 
 #ifndef OF_FLOAT_BIG_ENDIAN
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	float *tmp;
 
 	tmp = [self allocMemoryWithSize: sizeof(float)
-				  count: nFloats];
+				  count: count];
 
 	@try {
 		size_t i;
 
-		for (i = 0; i < nFloats; i++)
+		for (i = 0; i < count; i++)
 			tmp[i] = OF_BSWAP_FLOAT(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {
@@ -1322,27 +1322,27 @@
 
 	return size;
 }
 
 - (size_t)writeLittleEndianDoubles: (const double*)buffer
-			     count: (size_t)nDoubles
+			     count: (size_t)count
 {
-	size_t size = nDoubles * sizeof(double);
+	size_t size = count * sizeof(double);
 
 #ifndef OF_FLOAT_BIG_ENDIAN
 	[self writeBuffer: buffer
 		   length: size];
 #else
 	double *tmp;
 
 	tmp = [self allocMemoryWithSize: sizeof(double)
-				  count: nDoubles];
+				  count: count];
 
 	@try {
 		size_t i;
 
-		for (i = 0; i < nDoubles; i++)
+		for (i = 0; i < count; i++)
 			tmp[i] = OF_BSWAP_DOUBLE(buffer[i]);
 
 		[self writeBuffer: tmp
 			   length: size];
 	} @finally {