yaffs Make more symbol changes

Signed-off-by: Charles Manning <cdhmanning@gmail.com>

1 files changed, 1370 insertions, 1370 deletions

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 8bb5ed7..36e11f5 100644
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -42,86 +42,86 @@
 
 
 /* Robustification (if it ever comes about...) */
-static void yaffs_retire_block(yaffs_Device *dev, int blockInNAND);
-static void yaffs_handle_chunk_wr_error(yaffs_Device *dev, int chunkInNAND,
+static void yaffs_retire_block(yaffs_dev_t *dev, int flash_block);
+static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk,
 		int erasedOk);
-static void yaffs_handle_chunk_wr_ok(yaffs_Device *dev, int chunkInNAND,
+static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk,
 				const __u8 *data,
-				const yaffs_ExtendedTags *tags);
-static void yaffs_handle_chunk_update(yaffs_Device *dev, int chunkInNAND,
-				const yaffs_ExtendedTags *tags);
+				const yaffs_ext_tags *tags);
+static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk,
+				const yaffs_ext_tags *tags);
 
 /* Other local prototypes */
-static void yaffs_update_parent(yaffs_Object *obj);
-static int yaffs_unlink_obj(yaffs_Object *obj);
-static int yaffs_obj_cache_dirty(yaffs_Object *obj);
+static void yaffs_update_parent(yaffs_obj_t *obj);
+static int yaffs_unlink_obj(yaffs_obj_t *obj);
+static int yaffs_obj_cache_dirty(yaffs_obj_t *obj);
 
-static int yaffs_write_new_chunk(yaffs_Device *dev,
+static int yaffs_write_new_chunk(yaffs_dev_t *dev,
 					const __u8 *buffer,
-					yaffs_ExtendedTags *tags,
+					yaffs_ext_tags *tags,
 					int useReserve);
 
 
-static yaffs_Object *yaffs_new_obj(yaffs_Device *dev, int number,
-					yaffs_ObjectType type);
+static yaffs_obj_t *yaffs_new_obj(yaffs_dev_t *dev, int number,
+					yaffs_obj_type type);
 
 
-static int yaffs_apply_xattrib_mod(yaffs_Object *obj, char *buffer, yaffs_xattr_mod *xmod);
+static int yaffs_apply_xattrib_mod(yaffs_obj_t *obj, char *buffer, yaffs_xattr_mod *xmod);
 
-static void yaffs_remove_obj_from_dir(yaffs_Object *obj);
+static void yaffs_remove_obj_from_dir(yaffs_obj_t *obj);
 static int yaffs_check_structures(void);
-static int yaffs_generic_obj_del(yaffs_Object *in);
+static int yaffs_generic_obj_del(yaffs_obj_t *in);
 
-static int yaffs_check_chunk_erased(struct yaffs_DeviceStruct *dev,
-				int chunkInNAND);
+static int yaffs_check_chunk_erased(struct yaffs_dev_s *dev,
+				int nand_chunk);
 
-static int yaffs_unlink_worker(yaffs_Object *obj);
+static int yaffs_unlink_worker(yaffs_obj_t *obj);
 
-static int yaffs_tags_match(const yaffs_ExtendedTags *tags, int objectId,
+static int yaffs_tags_match(const yaffs_ext_tags *tags, int obj_id,
 			int chunkInObject);
 
-static int yaffs_alloc_chunk(yaffs_Device *dev, int useReserve,
-				yaffs_BlockInfo **blockUsedPtr);
+static int yaffs_alloc_chunk(yaffs_dev_t *dev, int useReserve,
+				yaffs_block_info_t **blockUsedPtr);
 
-static void yaffs_check_obj_details_loaded(yaffs_Object *in);
+static void yaffs_check_obj_details_loaded(yaffs_obj_t *in);
 
-static void yaffs_invalidate_whole_cache(yaffs_Object *in);
-static void yaffs_invalidate_chunk_cache(yaffs_Object *object, int chunkId);
+static void yaffs_invalidate_whole_cache(yaffs_obj_t *in);
+static void yaffs_invalidate_chunk_cache(yaffs_obj_t *object, int chunk_id);
 
-static int yaffs_find_chunk_in_file(yaffs_Object *in, int chunkInInode,
-				yaffs_ExtendedTags *tags);
+static int yaffs_find_chunk_in_file(yaffs_obj_t *in, int inode_chunk,
+				yaffs_ext_tags *tags);
 
-static int yaffs_verify_chunk_written(yaffs_Device *dev,
-					int chunkInNAND,
+static int yaffs_verify_chunk_written(yaffs_dev_t *dev,
+					int nand_chunk,
 					const __u8 *data,
-					yaffs_ExtendedTags *tags);
+					yaffs_ext_tags *tags);
 
 
-static void yaffs_load_name_from_oh(yaffs_Device *dev,YCHAR *name, const YCHAR *ohName, int bufferSize);
-static void yaffs_load_oh_from_name(yaffs_Device *dev,YCHAR *ohName, const YCHAR *name);
+static void yaffs_load_name_from_oh(yaffs_dev_t *dev,YCHAR *name, const YCHAR *ohName, int bufferSize);
+static void yaffs_load_oh_from_name(yaffs_dev_t *dev,YCHAR *ohName, const YCHAR *name);
 
 
 /* Function to calculate chunk and offset */
 
-static void yaffs_addr_to_chunk(yaffs_Device *dev, loff_t addr, int *chunkOut,
+static void yaffs_addr_to_chunk(yaffs_dev_t *dev, loff_t addr, int *chunkOut,
 		__u32 *offsetOut)
 {
 	int chunk;
 	__u32 offset;
 
-	chunk  = (__u32)(addr >> dev->chunkShift);
+	chunk  = (__u32)(addr >> dev->chunk_shift);
 
-	if (dev->chunkDiv == 1) {
+	if (dev->chunk_div == 1) {
 		/* easy power of 2 case */
-		offset = (__u32)(addr & dev->chunkMask);
+		offset = (__u32)(addr & dev->chunk_mask);
 	} else {
 		/* Non power-of-2 case */
 
 		loff_t chunkBase;
 
-		chunk /= dev->chunkDiv;
+		chunk /= dev->chunk_div;
 
-		chunkBase = ((loff_t)chunk) * dev->nDataBytesPerChunk;
+		chunkBase = ((loff_t)chunk) * dev->data_bytes_per_chunk;
 		offset = (__u32)(addr - chunkBase);
 	}
 
@@ -181,49 +181,49 @@ static __u32 Shifts(__u32 x)
  * Temporary buffer manipulations.
  */
 
-static int yaffs_init_tmp_buffers(yaffs_Device *dev)
+static int yaffs_init_tmp_buffers(yaffs_dev_t *dev)
 {
 	int i;
 	__u8 *buf = (__u8 *)1;
 
-	memset(dev->tempBuffer, 0, sizeof(dev->tempBuffer));
+	memset(dev->temp_buffer, 0, sizeof(dev->temp_buffer));
 
 	for (i = 0; buf && i < YAFFS_N_TEMP_BUFFERS; i++) {
-		dev->tempBuffer[i].line = 0;	/* not in use */
-		dev->tempBuffer[i].buffer = buf =
-		    YMALLOC_DMA(dev->param.totalBytesPerChunk);
+		dev->temp_buffer[i].line = 0;	/* not in use */
+		dev->temp_buffer[i].buffer = buf =
+		    YMALLOC_DMA(dev->param.total_bytes_per_chunk);
 	}
 
 	return buf ? YAFFS_OK : YAFFS_FAIL;
 }
 
-__u8 *yaffs_get_temp_buffer(yaffs_Device *dev, int lineNo)
+__u8 *yaffs_get_temp_buffer(yaffs_dev_t *dev, int line_no)
 {
 	int i, j;
 
-	dev->tempInUse++;
-	if (dev->tempInUse > dev->maxTemp)
-		dev->maxTemp = dev->tempInUse;
+	dev->temp_in_use++;
+	if (dev->temp_in_use > dev->max_temp)
+		dev->max_temp = dev->temp_in_use;
 
 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-		if (dev->tempBuffer[i].line == 0) {
-			dev->tempBuffer[i].line = lineNo;
-			if ((i + 1) > dev->maxTemp) {
-				dev->maxTemp = i + 1;
+		if (dev->temp_buffer[i].line == 0) {
+			dev->temp_buffer[i].line = line_no;
+			if ((i + 1) > dev->max_temp) {
+				dev->max_temp = i + 1;
 				for (j = 0; j <= i; j++)
-					dev->tempBuffer[j].maxLine =
-					    dev->tempBuffer[j].line;
+					dev->temp_buffer[j].max_line =
+					    dev->temp_buffer[j].line;
 			}
 
-			return dev->tempBuffer[i].buffer;
+			return dev->temp_buffer[i].buffer;
 		}
 	}
 
 	T(YAFFS_TRACE_BUFFERS,
 	  (TSTR("Out of temp buffers at line %d, other held by lines:"),
-	   lineNo));
+	   line_no));
 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
-		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->tempBuffer[i].line));
+		T(YAFFS_TRACE_BUFFERS, (TSTR(" %d "), dev->temp_buffer[i].line));
 
 	T(YAFFS_TRACE_BUFFERS, (TSTR(" " TENDSTR)));
 
@@ -232,21 +232,21 @@ __u8 *yaffs_get_temp_buffer(yaffs_Device *dev, int lineNo)
 	 * This is not good.
 	 */
 
-	dev->unmanagedTempAllocations++;
-	return YMALLOC(dev->nDataBytesPerChunk);
+	dev->unmanaged_buffer_allocs++;
+	return YMALLOC(dev->data_bytes_per_chunk);
 
 }
 
-void yaffs_release_temp_buffer(yaffs_Device *dev, __u8 *buffer,
-				    int lineNo)
+void yaffs_release_temp_buffer(yaffs_dev_t *dev, __u8 *buffer,
+				    int line_no)
 {
 	int i;
 
-	dev->tempInUse--;
+	dev->temp_in_use--;
 
 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-		if (dev->tempBuffer[i].buffer == buffer) {
-			dev->tempBuffer[i].line = 0;
+		if (dev->temp_buffer[i].buffer == buffer) {
+			dev->temp_buffer[i].line = 0;
 			return;
 		}
 	}
@@ -255,9 +255,9 @@ void yaffs_release_temp_buffer(yaffs_Device *dev, __u8 *buffer,
 		/* assume it is an unmanaged one. */
 		T(YAFFS_TRACE_BUFFERS,
 		  (TSTR("Releasing unmanaged temp buffer in line %d" TENDSTR),
-		   lineNo));
+		   line_no));
 		YFREE(buffer);
-		dev->unmanagedTempDeallocations++;
+		dev->unmanaged_buffer_deallocs++;
 	}
 
 }
@@ -265,21 +265,21 @@ void yaffs_release_temp_buffer(yaffs_Device *dev, __u8 *buffer,
 /*
  * Determine if we have a managed buffer.
  */
-int yaffs_is_managed_tmp_buffer(yaffs_Device *dev, const __u8 *buffer)
+int yaffs_is_managed_tmp_buffer(yaffs_dev_t *dev, const __u8 *buffer)
 {
 	int i;
 
 	for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) {
-		if (dev->tempBuffer[i].buffer == buffer)
+		if (dev->temp_buffer[i].buffer == buffer)
 			return 1;
 	}
 
-	for (i = 0; i < dev->param.nShortOpCaches; i++) {
-		if (dev->srCache[i].data == buffer)
+	for (i = 0; i < dev->param.n_caches; i++) {
+		if (dev->cache[i].data == buffer)
 			return 1;
 	}
 
-	if (buffer == dev->checkpointBuffer)
+	if (buffer == dev->checkpt_buffer)
 		return 1;
 
 	T(YAFFS_TRACE_ALWAYS,
@@ -309,14 +309,14 @@ static Y_INLINE int yaffs_hash_fn(int n)
  * Note that root might have a presence in NAND if permissions are set.
  */
 
-yaffs_Object *yaffs_Root(yaffs_Device *dev)
+yaffs_obj_t *yaffs_root(yaffs_dev_t *dev)
 {
-	return dev->rootDir;
+	return dev->root_dir;
 }
 
-yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
+yaffs_obj_t *yaffs_lost_n_found(yaffs_dev_t *dev)
 {
-	return dev->lostNFoundDir;
+	return dev->lost_n_found;
 }
 
 
@@ -324,10 +324,10 @@ yaffs_Object *yaffs_LostNFound(yaffs_Device *dev)
  *  Erased NAND checking functions
  */
 
-int yaffs_check_ff(__u8 *buffer, int nBytes)
+int yaffs_check_ff(__u8 *buffer, int n_bytes)
 {
 	/* Horrible, slow implementation */
-	while (nBytes--) {
+	while (n_bytes--) {
 		if (*buffer != 0xFF)
 			return 0;
 		buffer++;
@@ -335,22 +335,22 @@ int yaffs_check_ff(__u8 *buffer, int nBytes)
 	return 1;
 }
 
-static int yaffs_check_chunk_erased(struct yaffs_DeviceStruct *dev,
-				int chunkInNAND)
+static int yaffs_check_chunk_erased(struct yaffs_dev_s *dev,
+				int nand_chunk)
 {
 	int retval = YAFFS_OK;
 	__u8 *data = yaffs_get_temp_buffer(dev, __LINE__);
-	yaffs_ExtendedTags tags;
+	yaffs_ext_tags tags;
 	int result;
 
-	result = yaffs_rd_chunk_tags_nand(dev, chunkInNAND, data, &tags);
+	result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, data, &tags);
 
-	if (tags.eccResult > YAFFS_ECC_RESULT_NO_ERROR)
+	if (tags.ecc_result > YAFFS_ECC_RESULT_NO_ERROR)
 		retval = YAFFS_FAIL;
 
-	if (!yaffs_check_ff(data, dev->nDataBytesPerChunk) || tags.chunkUsed) {
+	if (!yaffs_check_ff(data, dev->data_bytes_per_chunk) || tags.chunk_used) {
 		T(YAFFS_TRACE_NANDACCESS,
-		  (TSTR("Chunk %d not erased" TENDSTR), chunkInNAND));
+		  (TSTR("Chunk %d not erased" TENDSTR), nand_chunk));
 		retval = YAFFS_FAIL;
 	}
 
@@ -361,21 +361,21 @@ static int yaffs_check_chunk_erased(struct yaffs_DeviceStruct *dev,
 }
 
 
-static int yaffs_verify_chunk_written(yaffs_Device *dev,
-					int chunkInNAND,
+static int yaffs_verify_chunk_written(yaffs_dev_t *dev,
+					int nand_chunk,
 					const __u8 *data,
-					yaffs_ExtendedTags *tags)
+					yaffs_ext_tags *tags)
 {
 	int retval = YAFFS_OK;
-	yaffs_ExtendedTags tempTags;
+	yaffs_ext_tags tempTags;
 	__u8 *buffer = yaffs_get_temp_buffer(dev,__LINE__);
 	int result;
 	
-	result = yaffs_rd_chunk_tags_nand(dev,chunkInNAND,buffer,&tempTags);
-	if(memcmp(buffer,data,dev->nDataBytesPerChunk) ||
-		tempTags.objectId != tags->objectId ||
-		tempTags.chunkId  != tags->chunkId ||
-		tempTags.byteCount != tags->byteCount)
+	result = yaffs_rd_chunk_tags_nand(dev,nand_chunk,buffer,&tempTags);
+	if(memcmp(buffer,data,dev->data_bytes_per_chunk) ||
+		tempTags.obj_id != tags->obj_id ||
+		tempTags.chunk_id  != tags->chunk_id ||
+		tempTags.n_bytes != tags->n_bytes)
 		retval = YAFFS_FAIL;
 
 	yaffs_release_temp_buffer(dev, buffer, __LINE__);
@@ -383,9 +383,9 @@ static int yaffs_verify_chunk_written(yaffs_Device *dev,
 	return retval;
 }
 
-static int yaffs_write_new_chunk(struct yaffs_DeviceStruct *dev,
+static int yaffs_write_new_chunk(struct yaffs_dev_s *dev,
 					const __u8 *data,
-					yaffs_ExtendedTags *tags,
+					yaffs_ext_tags *tags,
 					int useReserve)
 {
 	int attempts = 0;
@@ -395,7 +395,7 @@ static int yaffs_write_new_chunk(struct yaffs_DeviceStruct *dev,
 	yaffs2_checkpt_invalidate(dev);
 
 	do {
-		yaffs_BlockInfo *bi = 0;
+		yaffs_block_info_t *bi = 0;
 		int erasedOk = 0;
 
 		chunk = yaffs_alloc_chunk(dev, useReserve, &bi);
@@ -431,10 +431,10 @@ static int yaffs_write_new_chunk(struct yaffs_DeviceStruct *dev,
 		/* let's give it a try */
 		attempts++;
 
-		if(dev->param.alwaysCheckErased)
-			bi->skipErasedCheck = 0;
+		if(dev->param.always_check_erased)
+			bi->skip_erased_check = 0;
 
-		if (!bi->skipErasedCheck) {
+		if (!bi->skip_erased_check) {
 			erasedOk = yaffs_check_chunk_erased(dev, chunk);
 			if (erasedOk != YAFFS_OK) {
 				T(YAFFS_TRACE_ERROR,
@@ -453,7 +453,7 @@ static int yaffs_write_new_chunk(struct yaffs_DeviceStruct *dev,
 		writeOk = yaffs_wr_chunk_tags_nand(dev, chunk,
 				data, tags);
 
-		if(!bi->skipErasedCheck)
+		if(!bi->skip_erased_check)
 			writeOk = yaffs_verify_chunk_written(dev, chunk, data, tags);
 
 		if (writeOk != YAFFS_OK) {
@@ -463,7 +463,7 @@ static int yaffs_write_new_chunk(struct yaffs_DeviceStruct *dev,
 			continue;
 		}
 
-		bi->skipErasedCheck = 1;
+		bi->skip_erased_check = 1;
 
 		/* Copy the data into the robustification buffer */
 		yaffs_handle_chunk_wr_ok(dev, chunk, data, tags);
@@ -479,7 +479,7 @@ static int yaffs_write_new_chunk(struct yaffs_DeviceStruct *dev,
 			(TSTR("**>> yaffs write required %d attempts" TENDSTR),
 			attempts));
 
-		dev->nRetriedWrites += (attempts - 1);
+		dev->n_retired_writes += (attempts - 1);
 	}
 
 	return chunk;
@@ -491,43 +491,43 @@ static int yaffs_write_new_chunk(struct yaffs_DeviceStruct *dev,
  * Block retiring for handling a broken block.
  */
 
-static void yaffs_retire_block(yaffs_Device *dev, int blockInNAND)
+static void yaffs_retire_block(yaffs_dev_t *dev, int flash_block)
 {
-	yaffs_BlockInfo *bi = yaffs_get_block_info(dev, blockInNAND);
+	yaffs_block_info_t *bi = yaffs_get_block_info(dev, flash_block);
 
 	yaffs2_checkpt_invalidate(dev);
 	
 	yaffs2_clear_oldest_dirty_seq(dev,bi);
 
-	if (yaffs_mark_bad(dev, blockInNAND) != YAFFS_OK) {
-		if (yaffs_erase_block(dev, blockInNAND) != YAFFS_OK) {
+	if (yaffs_mark_bad(dev, flash_block) != YAFFS_OK) {
+		if (yaffs_erase_block(dev, flash_block) != YAFFS_OK) {
 			T(YAFFS_TRACE_ALWAYS, (TSTR(
 				"yaffs: Failed to mark bad and erase block %d"
-				TENDSTR), blockInNAND));
+				TENDSTR), flash_block));
 		} else {
-			yaffs_ExtendedTags tags;
-			int chunkId = blockInNAND * dev->param.nChunksPerBlock;
+			yaffs_ext_tags tags;
+			int chunk_id = flash_block * dev->param.chunks_per_block;
 
 			__u8 *buffer = yaffs_get_temp_buffer(dev, __LINE__);
 
-			memset(buffer, 0xff, dev->nDataBytesPerChunk);
+			memset(buffer, 0xff, dev->data_bytes_per_chunk);
 			yaffs_init_tags(&tags);
-			tags.sequenceNumber = YAFFS_SEQUENCE_BAD_BLOCK;
-			if (dev->param.writeChunkWithTagsToNAND(dev, chunkId -
-				dev->chunkOffset, buffer, &tags) != YAFFS_OK)
+			tags.seq_number = YAFFS_SEQUENCE_BAD_BLOCK;
+			if (dev->param.write_chunk_tags_fn(dev, chunk_id -
+				dev->chunk_offset, buffer, &tags) != YAFFS_OK)
 				T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Failed to "
 					TCONT("write bad block marker to block %d")
-					TENDSTR), blockInNAND));
+					TENDSTR), flash_block));
 
 			yaffs_release_temp_buffer(dev, buffer, __LINE__);
 		}
 	}
 
-	bi->blockState = YAFFS_BLOCK_STATE_DEAD;
-	bi->gcPrioritise = 0;
-	bi->needsRetiring = 0;
+	bi->block_state = YAFFS_BLOCK_STATE_DEAD;
+	bi->gc_prioritise = 0;
+	bi->needs_retiring = 0;
 
-	dev->nRetiredBlocks++;
+	dev->n_retired_blocks++;
 }
 
 /*
@@ -535,56 +535,56 @@ static void yaffs_retire_block(yaffs_Device *dev, int blockInNAND)
  *
  */
 
-static void yaffs_handle_chunk_wr_ok(yaffs_Device *dev, int chunkInNAND,
+static void yaffs_handle_chunk_wr_ok(yaffs_dev_t *dev, int nand_chunk,
 				const __u8 *data,
-				const yaffs_ExtendedTags *tags)
+				const yaffs_ext_tags *tags)
 {
 	dev=dev;
-	chunkInNAND=chunkInNAND;
+	nand_chunk=nand_chunk;
 	data=data;
 	tags=tags;
 }
 
-static void yaffs_handle_chunk_update(yaffs_Device *dev, int chunkInNAND,
-				const yaffs_ExtendedTags *tags)
+static void yaffs_handle_chunk_update(yaffs_dev_t *dev, int nand_chunk,
+				const yaffs_ext_tags *tags)
 {
 	dev=dev;
-	chunkInNAND=chunkInNAND;
+	nand_chunk=nand_chunk;
 	tags=tags;
 }
 
-void yaffs_handle_chunk_error(yaffs_Device *dev, yaffs_BlockInfo *bi)
+void yaffs_handle_chunk_error(yaffs_dev_t *dev, yaffs_block_info_t *bi)
 {
-	if (!bi->gcPrioritise) {
-		bi->gcPrioritise = 1;
-		dev->hasPendingPrioritisedGCs = 1;
-		bi->chunkErrorStrikes++;
+	if (!bi->gc_prioritise) {
+		bi->gc_prioritise = 1;
+		dev->has_pending_prioritised_gc = 1;
+		bi->chunk_error_strikes++;
 
-		if (bi->chunkErrorStrikes > 3) {
-			bi->needsRetiring = 1; /* Too many stikes, so retire this */
+		if (bi->chunk_error_strikes > 3) {
+			bi->needs_retiring = 1; /* Too many stikes, so retire this */
 			T(YAFFS_TRACE_ALWAYS, (TSTR("yaffs: Block struck out" TENDSTR)));
 
 		}
 	}
 }
 
-static void yaffs_handle_chunk_wr_error(yaffs_Device *dev, int chunkInNAND,
+static void yaffs_handle_chunk_wr_error(yaffs_dev_t *dev, int nand_chunk,
 		int erasedOk)
 {
-	int blockInNAND = chunkInNAND / dev->param.nChunksPerBlock;
-	yaffs_BlockInfo *bi = yaffs_get_block_info(dev, blockInNAND);
+	int flash_block = nand_chunk / dev->param.chunks_per_block;
+	yaffs_block_info_t *bi = yaffs_get_block_info(dev, flash_block);
 
 	yaffs_handle_chunk_error(dev, bi);
 
 	if (erasedOk) {
 		/* Was an actual write failure, so mark the block for retirement  */
-		bi->needsRetiring = 1;
+		bi->needs_retiring = 1;
 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-		  (TSTR("**>> Block %d needs retiring" TENDSTR), blockInNAND));
+		  (TSTR("**>> Block %d needs retiring" TENDSTR), flash_block));
 	}
 
 	/* Delete the chunk */
-	yaffs_chunk_del(dev, chunkInNAND, 1, __LINE__);
+	yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
 	yaffs_skip_rest_of_block(dev);
 }
 
@@ -612,24 +612,24 @@ static __u16 yaffs_calc_name_sum(const YCHAR *name)
 	return sum;
 }
 
-void yaffs_set_obj_name(yaffs_Object *obj, const YCHAR *name)
+void yaffs_set_obj_name(yaffs_obj_t *obj, const YCHAR *name)
 {
 #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-	memset(obj->shortName, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
+	memset(obj->short_name, 0, sizeof(YCHAR) * (YAFFS_SHORT_NAME_LENGTH+1));
 	if (name && yaffs_strnlen(name,YAFFS_SHORT_NAME_LENGTH+1) <= YAFFS_SHORT_NAME_LENGTH)
-		yaffs_strcpy(obj->shortName, name);
+		yaffs_strcpy(obj->short_name, name);
 	else
-		obj->shortName[0] = _Y('\0');
+		obj->short_name[0] = _Y('\0');
 #endif
 	obj->sum = yaffs_calc_name_sum(name);
 }
 
-void yaffs_set_obj_name_from_oh(yaffs_Object *obj, const yaffs_ObjectHeader *oh)
+void yaffs_set_obj_name_from_oh(yaffs_obj_t *obj, const yaffs_obj_header *oh)
 {
 #ifdef CONFIG_YAFFS_AUTO_UNICODE
 	YCHAR tmpName[YAFFS_MAX_NAME_LENGTH+1];
 	memset(tmpName,0,sizeof(tmpName));
-	yaffs_load_name_from_oh(obj->myDev,tmpName,oh->name,YAFFS_MAX_NAME_LENGTH+1);
+	yaffs_load_name_from_oh(obj->my_dev,tmpName,oh->name,YAFFS_MAX_NAME_LENGTH+1);
 	yaffs_set_obj_name(obj,tmpName);
 #else
 	yaffs_set_obj_name(obj,oh->name);
@@ -644,36 +644,36 @@ void yaffs_set_obj_name_from_oh(yaffs_Object *obj, const yaffs_ObjectHeader *oh)
  */
 
 
-yaffs_tnode_t *yaffs_get_tnode(yaffs_Device *dev)
+yaffs_tnode_t *yaffs_get_tnode(yaffs_dev_t *dev)
 {
 	yaffs_tnode_t *tn = yaffs_alloc_raw_tnode(dev);
 	if (tn){
-		memset(tn, 0, dev->tnodeSize);
-		dev->nTnodes++;
+		memset(tn, 0, dev->tnode_size);
+		dev->n_tnodes++;
 	}
 
-	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
+	dev->checkpoint_blocks_required = 0; /* force recalculation*/
 
 	return tn;
 }
 
 /* FreeTnode frees up a tnode and puts it back on the free list */
-static void yaffs_free_tnode(yaffs_Device *dev, yaffs_tnode_t *tn)
+static void yaffs_free_tnode(yaffs_dev_t *dev, yaffs_tnode_t *tn)
 {
 	yaffs_free_raw_tnode(dev,tn);
-	dev->nTnodes--;
-	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
+	dev->n_tnodes--;
+	dev->checkpoint_blocks_required = 0; /* force recalculation*/
 }
 
-static void yaffs_deinit_tnodes_and_objs(yaffs_Device *dev)
+static void yaffs_deinit_tnodes_and_objs(yaffs_dev_t *dev)
 {
 	yaffs_deinit_raw_tnodes_and_objs(dev);
-	dev->nObjects = 0;
-	dev->nTnodes = 0;
+	dev->n_obj = 0;
+	dev->n_tnodes = 0;
 }
 
 
-void yaffs_load_tnode_0(yaffs_Device *dev, yaffs_tnode_t *tn, unsigned pos,
+void yaffs_load_tnode_0(yaffs_dev_t *dev, yaffs_tnode_t *tn, unsigned pos,
 		unsigned val)
 {
 	__u32 *map = (__u32 *)tn;
@@ -683,27 +683,27 @@ void yaffs_load_tnode_0(yaffs_Device *dev, yaffs_tnode_t *tn, unsigned pos,
 	__u32 mask;
 
 	pos &= YAFFS_TNODES_LEVEL0_MASK;
-	val >>= dev->chunkGroupBits;
+	val >>= dev->chunk_grp_bits;
 
-	bitInMap = pos * dev->tnodeWidth;
+	bitInMap = pos * dev->tnode_width;
 	wordInMap = bitInMap / 32;
 	bitInWord = bitInMap & (32 - 1);
 
-	mask = dev->tnodeMask << bitInWord;
+	mask = dev->tnode_mask << bitInWord;
 
 	map[wordInMap] &= ~mask;
 	map[wordInMap] |= (mask & (val << bitInWord));
 
-	if (dev->tnodeWidth > (32 - bitInWord)) {
+	if (dev->tnode_width > (32 - bitInWord)) {
 		bitInWord = (32 - bitInWord);
 		wordInMap++;;
-		mask = dev->tnodeMask >> (/*dev->tnodeWidth -*/ bitInWord);
+		mask = dev->tnode_mask >> (/*dev->tnode_width -*/ bitInWord);
 		map[wordInMap] &= ~mask;
 		map[wordInMap] |= (mask & (val >> bitInWord));
 	}
 }
 
-__u32 yaffs_get_group_base(yaffs_Device *dev, yaffs_tnode_t *tn,
+__u32 yaffs_get_group_base(yaffs_dev_t *dev, yaffs_tnode_t *tn,
 		unsigned pos)
 {
 	__u32 *map = (__u32 *)tn;
@@ -714,20 +714,20 @@ __u32 yaffs_get_group_base(yaffs_Device *dev, yaffs_tnode_t *tn,
 
 	pos &= YAFFS_TNODES_LEVEL0_MASK;
 
-	bitInMap = pos * dev->tnodeWidth;
+	bitInMap = pos * dev->tnode_width;
 	wordInMap = bitInMap / 32;
 	bitInWord = bitInMap & (32 - 1);
 
 	val = map[wordInMap] >> bitInWord;
 
-	if	(dev->tnodeWidth > (32 - bitInWord)) {
+	if	(dev->tnode_width > (32 - bitInWord)) {
 		bitInWord = (32 - bitInWord);
 		wordInMap++;;
 		val |= (map[wordInMap] << bitInWord);
 	}
 
-	val &= dev->tnodeMask;
-	val <<= dev->chunkGroupBits;
+	val &= dev->tnode_mask;
+	val <<= dev->chunk_grp_bits;
 
 	return val;
 }
@@ -735,19 +735,19 @@ __u32 yaffs_get_group_base(yaffs_Device *dev, yaffs_tnode_t *tn,
 /* ------------------- End of individual tnode manipulation -----------------*/
 
 /* ---------Functions to manipulate the look-up tree (made up of tnodes) ------
- * The look up tree is represented by the top tnode and the number of topLevel
+ * The look up tree is represented by the top tnode and the number of top_level
  * in the tree. 0 means only the level 0 tnode is in the tree.
  */
 
 /* FindLevel0Tnode finds the level 0 tnode, if one exists. */
-yaffs_tnode_t *yaffs_find_tnode_0(yaffs_Device *dev,
-					yaffs_FileStructure *fStruct,
-					__u32 chunkId)
+yaffs_tnode_t *yaffs_find_tnode_0(yaffs_dev_t *dev,
+					yaffs_file_s *file_struct,
+					__u32 chunk_id)
 {
-	yaffs_tnode_t *tn = fStruct->top;
+	yaffs_tnode_t *tn = file_struct->top;
 	__u32 i;
 	int requiredTallness;
-	int level = fStruct->topLevel;
+	int level = file_struct->top_level;
 
 	dev=dev;
 
@@ -755,24 +755,24 @@ yaffs_tnode_t *yaffs_find_tnode_0(yaffs_Device *dev,
 	if (level < 0 || level > YAFFS_TNODES_MAX_LEVEL)
 		return NULL;
 
-	if (chunkId > YAFFS_MAX_CHUNK_ID)
+	if (chunk_id > YAFFS_MAX_CHUNK_ID)
 		return NULL;
 
-	/* First check we're tall enough (ie enough topLevel) */
+	/* First check we're tall enough (ie enough top_level) */
 
-	i = chunkId >> YAFFS_TNODES_LEVEL0_BITS;
+	i = chunk_id >> YAFFS_TNODES_LEVEL0_BITS;
 	requiredTallness = 0;
 	while (i) {
 		i >>= YAFFS_TNODES_INTERNAL_BITS;
 		requiredTallness++;
 	}
 
-	if (requiredTallness > fStruct->topLevel)
+	if (requiredTallness > file_struct->top_level)
 		return NULL; /* Not tall enough, so we can't find it */
 
 	/* Traverse down to level 0 */
 	while (level > 0 && tn) {
-		tn = tn->internal[(chunkId >>
+		tn = tn->internal[(chunk_id >>
 			(YAFFS_TNODES_LEVEL0_BITS +
 				(level - 1) *
 				YAFFS_TNODES_INTERNAL_BITS)) &
@@ -794,10 +794,10 @@ yaffs_tnode_t *yaffs_find_tnode_0(yaffs_Device *dev,
  *  be plugged into the ttree.
  */
 
-yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_Device *dev,
-					yaffs_FileStructure *fStruct,
-					__u32 chunkId,
-					yaffs_tnode_t *passedTn)
+yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_dev_t *dev,
+					yaffs_file_s *file_struct,
+					__u32 chunk_id,
+					yaffs_tnode_t *passed_tn)
 {
 	int requiredTallness;
 	int i;
@@ -808,15 +808,15 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_Device *dev,
 
 
 	/* Check sane level and page Id */
-	if (fStruct->topLevel < 0 || fStruct->topLevel > YAFFS_TNODES_MAX_LEVEL)
+	if (file_struct->top_level < 0 || file_struct->top_level > YAFFS_TNODES_MAX_LEVEL)
 		return NULL;
 
-	if (chunkId > YAFFS_MAX_CHUNK_ID)
+	if (chunk_id > YAFFS_MAX_CHUNK_ID)
 		return NULL;
 
-	/* First check we're tall enough (ie enough topLevel) */
+	/* First check we're tall enough (ie enough top_level) */
 
-	x = chunkId >> YAFFS_TNODES_LEVEL0_BITS;
+	x = chunk_id >> YAFFS_TNODES_LEVEL0_BITS;
 	requiredTallness = 0;
 	while (x) {
 		x >>= YAFFS_TNODES_INTERNAL_BITS;
@@ -824,16 +824,16 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_Device *dev,
 	}
 
 
-	if (requiredTallness > fStruct->topLevel) {
+	if (requiredTallness > file_struct->top_level) {
 		/* Not tall enough, gotta make the tree taller */
-		for (i = fStruct->topLevel; i < requiredTallness; i++) {
+		for (i = file_struct->top_level; i < requiredTallness; i++) {
 
 			tn = yaffs_get_tnode(dev);
 
 			if (tn) {
-				tn->internal[0] = fStruct->top;
-				fStruct->top = tn;
-				fStruct->topLevel++;
+				tn->internal[0] = file_struct->top;
+				file_struct->top = tn;
+				file_struct->top_level++;
 			} else {
 				T(YAFFS_TRACE_ERROR,
 					(TSTR("yaffs: no more tnodes" TENDSTR)));
@@ -844,12 +844,12 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_Device *dev,
 
 	/* Traverse down to level 0, adding anything we need */
 
-	l = fStruct->topLevel;
-	tn = fStruct->top;
+	l = file_struct->top_level;
+	tn = file_struct->top;
 
 	if (l > 0) {
 		while (l > 0 && tn) {
-			x = (chunkId >>
+			x = (chunk_id >>
 			     (YAFFS_TNODES_LEVEL0_BITS +
 			      (l - 1) * YAFFS_TNODES_INTERNAL_BITS)) &
 			    YAFFS_TNODES_INTERNAL_MASK;
@@ -862,11 +862,11 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_Device *dev,
 					return NULL;
 			} else if (l == 1) {
 				/* Looking from level 1 at level 0 */
-				if (passedTn) {
+				if (passed_tn) {
 					/* If we already have one, then release it.*/
 					if (tn->internal[x])
 						yaffs_free_tnode(dev, tn->internal[x]);
-					tn->internal[x] = passedTn;
+					tn->internal[x] = passed_tn;
 
 				} else if (!tn->internal[x]) {
 					/* Don't have one, none passed in */
@@ -881,31 +881,31 @@ yaffs_tnode_t *yaffs_add_find_tnode_0(yaffs_Device *dev,
 		}
 	} else {
 		/* top is level 0 */
-		if (passedTn) {
-			memcpy(tn, passedTn, (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8);
-			yaffs_free_tnode(dev, passedTn);
+		if (passed_tn) {
+			memcpy(tn, passed_tn, (dev->tnode_width * YAFFS_NTNODES_LEVEL0)/8);
+			yaffs_free_tnode(dev, passed_tn);
 		}
 	}
 
 	return tn;
 }
 
-static int yaffs_find_chunk_in_group(yaffs_Device *dev, int theChunk,
-				yaffs_ExtendedTags *tags, int objectId,
-				int chunkInInode)
+static int yaffs_find_chunk_in_group(yaffs_dev_t *dev, int theChunk,
+				yaffs_ext_tags *tags, int obj_id,
+				int inode_chunk)
 {
 	int j;
 
-	for (j = 0; theChunk && j < dev->chunkGroupSize; j++) {
-		if (yaffs_check_chunk_bit(dev, theChunk / dev->param.nChunksPerBlock,
-				theChunk % dev->param.nChunksPerBlock)) {
+	for (j = 0; theChunk && j < dev->chunk_grp_size; j++) {
+		if (yaffs_check_chunk_bit(dev, theChunk / dev->param.chunks_per_block,
+				theChunk % dev->param.chunks_per_block)) {
 			
-			if(dev->chunkGroupSize == 1)
+			if(dev->chunk_grp_size == 1)
 				return theChunk;
 			else {
 				yaffs_rd_chunk_tags_nand(dev, theChunk, NULL,
 								tags);
-				if (yaffs_tags_match(tags, objectId, chunkInInode)) {
+				if (yaffs_tags_match(tags, obj_id, inode_chunk)) {
 					/* found it; */
 					return theChunk;
 				}
@@ -924,15 +924,15 @@ static int yaffs_find_chunk_in_group(yaffs_Device *dev, int theChunk,
  * Returns 0 if it stopped early due to hitting the limit and the delete is incomplete.
  */
 
-static int yaffs_del_worker(yaffs_Object *in, yaffs_tnode_t *tn, __u32 level,
-			      int chunkOffset, int *limit)
+static int yaffs_del_worker(yaffs_obj_t *in, yaffs_tnode_t *tn, __u32 level,
+			      int chunk_offset, int *limit)
 {
 	int i;
-	int chunkInInode;
+	int inode_chunk;
 	int theChunk;
-	yaffs_ExtendedTags tags;
+	yaffs_ext_tags tags;
 	int foundChunk;
-	yaffs_Device *dev = in->myDev;
+	yaffs_dev_t *dev = in->my_dev;
 
 	int allDone = 1;
 
@@ -951,7 +951,7 @@ static int yaffs_del_worker(yaffs_Object *in, yaffs_tnode_t *tn, __u32 level,
 								[i],
 								level -
 								1,
-								(chunkOffset
+								(chunk_offset
 									<<
 									YAFFS_TNODES_INTERNAL_BITS)
 								+ i,
@@ -974,21 +974,21 @@ static int yaffs_del_worker(yaffs_Object *in, yaffs_tnode_t *tn, __u32 level,
 				theChunk = yaffs_get_group_base(dev, tn, i);
 				if (theChunk) {
 
-					chunkInInode = (chunkOffset <<
+					inode_chunk = (chunk_offset <<
 						YAFFS_TNODES_LEVEL0_BITS) + i;
 
 					foundChunk =
 						yaffs_find_chunk_in_group(dev,
 								theChunk,
 								&tags,
-								in->objectId,
-								chunkInInode);
+								in->obj_id,
+								inode_chunk);
 
 					if (foundChunk > 0) {
 						yaffs_chunk_del(dev,
 								  foundChunk, 1,
 								  __LINE__);
-						in->nDataChunks--;
+						in->n_data_chunks--;
 						if (limit) {
 							*limit = *limit - 1;
 							if (*limit <= 0)
@@ -1013,19 +1013,19 @@ static int yaffs_del_worker(yaffs_Object *in, yaffs_tnode_t *tn, __u32 level,
 
 #endif
 
-static void yaffs_soft_del_chunk(yaffs_Device *dev, int chunk)
+static void yaffs_soft_del_chunk(yaffs_dev_t *dev, int chunk)
 {
-	yaffs_BlockInfo *theBlock;
-	unsigned blockNo;
+	yaffs_block_info_t *theBlock;
+	unsigned block_no;
 
 	T(YAFFS_TRACE_DELETION, (TSTR("soft delete chunk %d" TENDSTR), chunk));
 
-	blockNo =  chunk / dev->param.nChunksPerBlock;
-	theBlock = yaffs_get_block_info(dev, blockNo);
+	block_no =  chunk / dev->param.chunks_per_block;
+	theBlock = yaffs_get_block_info(dev, block_no);
 	if (theBlock) {
-		theBlock->softDeletions++;
-		dev->nFreeChunks++;
-		yaffs2_update_oldest_dirty_seq(dev, blockNo, theBlock);
+		theBlock->soft_del_pages++;
+		dev->n_free_chunks++;
+		yaffs2_update_oldest_dirty_seq(dev, block_no, theBlock);
 	}
 }
 
@@ -1035,13 +1035,13 @@ static void yaffs_soft_del_chunk(yaffs_Device *dev, int chunk)
  * Thus, essentially this is the same as DeleteWorker except that the chunks are soft deleted.
  */
 
-static int yaffs_soft_del_worker(yaffs_Object *in, yaffs_tnode_t *tn,
-				  __u32 level, int chunkOffset)
+static int yaffs_soft_del_worker(yaffs_obj_t *in, yaffs_tnode_t *tn,
+				  __u32 level, int chunk_offset)
 {
 	int i;
 	int theChunk;
 	int allDone = 1;
-	yaffs_Device *dev = in->myDev;
+	yaffs_dev_t *dev = in->my_dev;
 
 	if (tn) {
 		if (level > 0) {
@@ -1054,7 +1054,7 @@ static int yaffs_soft_del_worker(yaffs_Object *in, yaffs_tnode_t *tn,
 								   tn->
 								   internal[i],
 								   level - 1,
-								   (chunkOffset
+								   (chunk_offset
 								    <<
 								    YAFFS_TNODES_INTERNAL_BITS)
 								   + i);
@@ -1093,25 +1093,25 @@ static int yaffs_soft_del_worker(yaffs_Object *in, yaffs_tnode_t *tn,
 
 }
 
-static void yaffs_soft_del_file(yaffs_Object *obj)
+static void yaffs_soft_del_file(yaffs_obj_t *obj)
 {
 	if (obj->deleted &&
-	    obj->variantType == YAFFS_OBJECT_TYPE_FILE && !obj->softDeleted) {
-		if (obj->nDataChunks <= 0) {
+	    obj->variant_type == YAFFS_OBJECT_TYPE_FILE && !obj->soft_del) {
+		if (obj->n_data_chunks <= 0) {
 			/* Empty file with no duplicate object headers, just delete it immediately */
-			yaffs_free_tnode(obj->myDev,
-					obj->variant.fileVariant.top);
-			obj->variant.fileVariant.top = NULL;
+			yaffs_free_tnode(obj->my_dev,
+					obj->variant.file_variant.top);
+			obj->variant.file_variant.top = NULL;
 			T(YAFFS_TRACE_TRACING,
 			  (TSTR("yaffs: Deleting empty file %d" TENDSTR),
-			   obj->objectId));
+			   obj->obj_id));
 			yaffs_generic_obj_del(obj);
 		} else {
 			yaffs_soft_del_worker(obj,
-					       obj->variant.fileVariant.top,
-					       obj->variant.fileVariant.
-					       topLevel, 0);
-			obj->softDeleted = 1;
+					       obj->variant.file_variant.top,
+					       obj->variant.file_variant.
+					       top_level, 0);
+			obj->soft_del = 1;
 		}
 	}
 }
@@ -1131,7 +1131,7 @@ static void yaffs_soft_del_file(yaffs_Object *obj)
  * If there is no data in a subtree then it is pruned.
  */
 
-static yaffs_tnode_t *yaffs_prune_worker(yaffs_Device *dev, yaffs_tnode_t *tn,
+static yaffs_tnode_t *yaffs_prune_worker(yaffs_dev_t *dev, yaffs_tnode_t *tn,
 				__u32 level, int del0)
 {
 	int i;
@@ -1153,10 +1153,10 @@ static yaffs_tnode_t *yaffs_prune_worker(yaffs_Device *dev, yaffs_tnode_t *tn,
 					hasData++;
 			}
 		} else {
-			int tnodeSize_u32 = dev->tnodeSize/sizeof(__u32);
+			int tnode_size_u32 = dev->tnode_size/sizeof(__u32);
 			__u32 *map = (__u32 *)tn;
 
-                        for(i = 0; !hasData && i < tnodeSize_u32; i++){
+                        for(i = 0; !hasData && i < tnode_size_u32; i++){
                                 if(map[i])
                                         hasData++;
                         }
@@ -1175,17 +1175,17 @@ static yaffs_tnode_t *yaffs_prune_worker(yaffs_Device *dev, yaffs_tnode_t *tn,
 
 }
 
-static int yaffs_prune_tree(yaffs_Device *dev,
-				yaffs_FileStructure *fStruct)
+static int yaffs_prune_tree(yaffs_dev_t *dev,
+				yaffs_file_s *file_struct)
 {
 	int i;
 	int hasData;
 	int done = 0;
 	yaffs_tnode_t *tn;
 
-	if (fStruct->topLevel > 0) {
-		fStruct->top =
-		    yaffs_prune_worker(dev, fStruct->top, fStruct->topLevel, 0);
+	if (file_struct->top_level > 0) {
+		file_struct->top =
+		    yaffs_prune_worker(dev, file_struct->top, file_struct->top_level, 0);
 
 		/* Now we have a tree with all the non-zero branches NULL but the height
 		 * is the same as it was.
@@ -1194,8 +1194,8 @@ static int yaffs_prune_tree(yaffs_Device *dev,
 		 * (ie all the non-zero are NULL)
 		 */
 
-		while (fStruct->topLevel && !done) {
-			tn = fStruct->top;
+		while (file_struct->top_level && !done) {
+			tn = file_struct->top;
 
 			hasData = 0;
 			for (i = 1; i < YAFFS_NTNODES_INTERNAL; i++) {
@@ -1204,8 +1204,8 @@ static int yaffs_prune_tree(yaffs_Device *dev,
 			}
 
 			if (!hasData) {
-				fStruct->top = tn->internal[0];
-				fStruct->topLevel--;
+				file_struct->top = tn->internal[0];
+				file_struct->top_level--;
 				yaffs_free_tnode(dev, tn);
 			} else {
 				done = 1;
@@ -1220,87 +1220,87 @@ static int yaffs_prune_tree(yaffs_Device *dev,
 
 
 /* AllocateEmptyObject gets us a clean Object. Tries to make allocate more if we run out */
-static yaffs_Object *yaffs_alloc_empty_obj(yaffs_Device *dev)
+static yaffs_obj_t *yaffs_alloc_empty_obj(yaffs_dev_t *dev)
 {
-	yaffs_Object *obj = yaffs_alloc_raw_obj(dev);
+	yaffs_obj_t *obj = yaffs_alloc_raw_obj(dev);
 
 	if (obj) {
-		dev->nObjects++;
+		dev->n_obj++;
 
 		/* Now sweeten it up... */
 
-		memset(obj, 0, sizeof(yaffs_Object));
-		obj->beingCreated = 1;
+		memset(obj, 0, sizeof(yaffs_obj_t));
+		obj->being_created = 1;
 
-		obj->myDev = dev;
-		obj->hdrChunk = 0;
-		obj->variantType = YAFFS_OBJECT_TYPE_UNKNOWN;
-		YINIT_LIST_HEAD(&(obj->hardLinks));
-		YINIT_LIST_HEAD(&(obj->hashLink));
+		obj->my_dev = dev;
+		obj->hdr_chunk = 0;
+		obj->variant_type = YAFFS_OBJECT_TYPE_UNKNOWN;
+		YINIT_LIST_HEAD(&(obj->hard_links));
+		YINIT_LIST_HEAD(&(obj->hash_link));
 		YINIT_LIST_HEAD(&obj->siblings);
 
 
 		/* Now make the directory sane */
-		if (dev->rootDir) {
-			obj->parent = dev->rootDir;
-			ylist_add(&(obj->siblings), &dev->rootDir->variant.directoryVariant.children);
+		if (dev->root_dir) {
+			obj->parent = dev->root_dir;
+			ylist_add(&(obj->siblings), &dev->root_dir->variant.dir_variant.children);
 		}
 
 		/* Add it to the lost and found directory.
 		 * NB Can't put root or lostNFound in lostNFound so
 		 * check if lostNFound exists first
 		 */
-		if (dev->lostNFoundDir)
-			yaffs_add_obj_to_dir(dev->lostNFoundDir, obj);
+		if (dev->lost_n_found)
+			yaffs_add_obj_to_dir(dev->lost_n_found, obj);
 
-		obj->beingCreated = 0;
+		obj->being_created = 0;
 	}
 
-	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
+	dev->checkpoint_blocks_required = 0; /* force recalculation*/
 
 	return obj;
 }
 
-static yaffs_Object *yaffs_create_fake_dir(yaffs_Device *dev, int number,
+static yaffs_obj_t *yaffs_create_fake_dir(yaffs_dev_t *dev, int number,
 					       __u32 mode)
 {
 
-	yaffs_Object *obj =
+	yaffs_obj_t *obj =
 	    yaffs_new_obj(dev, number, YAFFS_OBJECT_TYPE_DIRECTORY);
 	if (obj) {
 		obj->fake = 1;		/* it is fake so it might have no NAND presence... */
-		obj->renameAllowed = 0;	/* ... and we're not allowed to rename it... */
-		obj->unlinkAllowed = 0;	/* ... or unlink it */
+		obj->rename_allowed = 0;	/* ... and we're not allowed to rename it... */
+		obj->unlink_allowed = 0;	/* ... or unlink it */
 		obj->deleted = 0;
 		obj->unlinked = 0;
 		obj->yst_mode = mode;
-		obj->myDev = dev;
-		obj->hdrChunk = 0;	/* Not a valid chunk. */
+		obj->my_dev = dev;
+		obj->hdr_chunk = 0;	/* Not a valid chunk. */
 	}
 
 	return obj;
 
 }
 
-static void yaffs_unhash_obj(yaffs_Object *obj)
+static void yaffs_unhash_obj(yaffs_obj_t *obj)
 {
 	int bucket;
-	yaffs_Device *dev = obj->myDev;
+	yaffs_dev_t *dev = obj->my_dev;
 
 	/* If it is still linked into the bucket list, free from the list */
-	if (!ylist_empty(&obj->hashLink)) {
-		ylist_del_init(&obj->hashLink);
-		bucket = yaffs_hash_fn(obj->objectId);
-		dev->objectBucket[bucket].count--;
+	if (!ylist_empty(&obj->hash_link)) {
+		ylist_del_init(&obj->hash_link);
+		bucket = yaffs_hash_fn(obj->obj_id);
+		dev->obj_bucket[bucket].count--;
 	}
 }
 
 /*  FreeObject frees up a Object and puts it back on the free list */
-static void yaffs_free_obj(yaffs_Object *obj)
+static void yaffs_free_obj(yaffs_obj_t *obj)
 {
-	yaffs_Device *dev = obj->myDev;
+	yaffs_dev_t *dev = obj->my_dev;
 
-	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), obj, obj->myInode));
+	T(YAFFS_TRACE_OS, (TSTR("FreeObject %p inode %p"TENDSTR), obj, obj->my_inode));
 
 	if (!obj)
 		YBUG();
@@ -1310,44 +1310,44 @@ static void yaffs_free_obj(yaffs_Object *obj)
 		YBUG();
 
 
-	if (obj->myInode) {
+	if (obj->my_inode) {
 		/* We're still hooked up to a cached inode.
 		 * Don't delete now, but mark for later deletion
 		 */
-		obj->deferedFree = 1;
+		obj->defered_free = 1;
 		return;
 	}
 
 	yaffs_unhash_obj(obj);
 
 	yaffs_free_raw_obj(dev,obj);
-	dev->nObjects--;
-	dev->nCheckpointBlocksRequired = 0; /* force recalculation*/
+	dev->n_obj--;
+	dev->checkpoint_blocks_required = 0; /* force recalculation*/
 }
 
 
-void yaffs_handle_defered_free(yaffs_Object *obj)
+void yaffs_handle_defered_free(yaffs_obj_t *obj)
 {
-	if (obj->deferedFree)
+	if (obj->defered_free)
 		yaffs_free_obj(obj);
 }
 
-static void yaffs_init_tnodes_and_objs(yaffs_Device *dev)
+static void yaffs_init_tnodes_and_objs(yaffs_dev_t *dev)
 {
 	int i;
 
-	dev->nObjects = 0;
-	dev->nTnodes = 0;
+	dev->n_obj = 0;
+	dev->n_tnodes = 0;
 
 	yaffs_init_raw_tnodes_and_objs(dev);
 
 	for (i = 0; i < YAFFS_NOBJECT_BUCKETS; i++) {
-		YINIT_LIST_HEAD(&dev->objectBucket[i].list);
-		dev->objectBucket[i].count = 0;
+		YINIT_LIST_HEAD(&dev->obj_bucket[i].list);
+		dev->obj_bucket[i].count = 0;
 	}
 }
 
-static int yaffs_find_nice_bucket(yaffs_Device *dev)
+static int yaffs_find_nice_bucket(yaffs_dev_t *dev)
 {
 	int i;
 	int l = 999;
@@ -1359,11 +1359,11 @@ static int yaffs_find_nice_bucket(yaffs_Device *dev)
 	 */
 
 	for (i = 0; i < 10 && lowest > 4; i++) {
-		dev->bucketFinder++;
-		dev->bucketFinder %= YAFFS_NOBJECT_BUCKETS;
-		if (dev->objectBucket[dev->bucketFinder].count < lowest) {
-			lowest = dev->objectBucket[dev->bucketFinder].count;
-			l = dev->bucketFinder;
+		dev->bucket_finder++;
+		dev->bucket_finder %= YAFFS_NOBJECT_BUCKETS;
+		if (dev->obj_bucket[dev->bucket_finder].count < lowest) {
+			lowest = dev->obj_bucket[dev->bucket_finder].count;
+			l = dev->bucket_finder;
 		}
 
 	}
@@ -1371,7 +1371,7 @@ static int yaffs_find_nice_bucket(yaffs_Device *dev)
 	return l;
 }
 
-static int yaffs_new_obj_id(yaffs_Device *dev)
+static int yaffs_new_obj_id(yaffs_dev_t *dev)
 {
 	int bucket = yaffs_find_nice_bucket(dev);
 
@@ -1389,11 +1389,11 @@ static int yaffs_new_obj_id(yaffs_Device *dev)
 	while (!found) {
 		found = 1;
 		n += YAFFS_NOBJECT_BUCKETS;
-		if (1 || dev->objectBucket[bucket].count > 0) {
-			ylist_for_each(i, &dev->objectBucket[bucket].list) {
+		if (1 || dev->obj_bucket[bucket].count > 0) {
+			ylist_for_each(i, &dev->obj_bucket[bucket].list) {
 				/* If there is already one in the list */
-				if (i && ylist_entry(i, yaffs_Object,
-						hashLink)->objectId == n) {
+				if (i && ylist_entry(i, yaffs_obj_t,
+						hash_link)->obj_id == n) {
 					found = 0;
 				}
 			}
@@ -1403,29 +1403,29 @@ static int yaffs_new_obj_id(yaffs_Device *dev)
 	return n;
 }
 
-static void yaffs_hash_obj(yaffs_Object *in)
+static void yaffs_hash_obj(yaffs_obj_t *in)
 {
-	int bucket = yaffs_hash_fn(in->objectId);
-	yaffs_Device *dev = in->myDev;
+	int bucket = yaffs_hash_fn(in->obj_id);
+	yaffs_dev_t *dev = in->my_dev;
 
-	ylist_add(&in->hashLink, &dev->objectBucket[bucket].list);
-	dev->objectBucket[bucket].count++;
+	ylist_add(&in->hash_link, &dev->obj_bucket[bucket].list);
+	dev->obj_bucket[bucket].count++;
 }
 
-yaffs_Object *yaffs_find_by_number(yaffs_Device *dev, __u32 number)
+yaffs_obj_t *yaffs_find_by_number(yaffs_dev_t *dev, __u32 number)
 {
 	int bucket = yaffs_hash_fn(number);
 	struct ylist_head *i;
-	yaffs_Object *in;
+	yaffs_obj_t *in;
 
-	ylist_for_each(i, &dev->objectBucket[bucket].list) {
+	ylist_for_each(i, &dev->obj_bucket[bucket].list) {
 		/* Look if it is in the list */
 		if (i) {
-			in = ylist_entry(i, yaffs_Object, hashLink);
-			if (in->objectId == number) {
+			in = ylist_entry(i, yaffs_obj_t, hash_link);
+			if (in->obj_id == number) {
 
 				/* Don't tell the VFS about this one if it is defered free */
-				if (in->deferedFree)
+				if (in->defered_free)
 					return NULL;
 
 				return in;
@@ -1436,10 +1436,10 @@ yaffs_Object *yaffs_find_by_number(yaffs_Device *dev, __u32 number)
 	return NULL;
 }
 
-yaffs_Object *yaffs_new_obj(yaffs_Device *dev, int number,
-				    yaffs_ObjectType type)
+yaffs_obj_t *yaffs_new_obj(yaffs_dev_t *dev, int number,
+				    yaffs_obj_type type)
 {
-	yaffs_Object *theObject=NULL;
+	yaffs_obj_t *theObject=NULL;
 	yaffs_tnode_t *tn = NULL;
 
 	if (number < 0)
@@ -1461,11 +1461,11 @@ yaffs_Object *yaffs_new_obj(yaffs_Device *dev, int number,
 
 	if (theObject) {
 		theObject->fake = 0;
-		theObject->renameAllowed = 1;
-		theObject->unlinkAllowed = 1;
-		theObject->objectId = number;
+		theObject->rename_allowed = 1;
+		theObject->unlink_allowed = 1;
+		theObject->obj_id = number;
 		yaffs_hash_obj(theObject);
-		theObject->variantType = type;
+		theObject->variant_type = type;
 #ifdef CONFIG_YAFFS_WINCE
 		yfsd_win_file_time_now(theObject->win_atime);
 		theObject->win_ctime[0] = theObject->win_mtime[0] =
@@ -1480,16 +1480,16 @@ yaffs_Object *yaffs_new_obj(yaffs_Device *dev, int number,
 #endif
 		switch (type) {
 		case YAFFS_OBJECT_TYPE_FILE:
-			theObject->variant.fileVariant.fileSize = 0;
-			theObject->variant.fileVariant.scannedFileSize = 0;
-			theObject->variant.fileVariant.shrinkSize = 0xFFFFFFFF;	/* max __u32 */
-			theObject->variant.fileVariant.topLevel = 0;
-			theObject->variant.fileVariant.top = tn;
+			theObject->variant.file_variant.file_size = 0;
+			theObject->variant.file_variant.scanned_size = 0;
+			theObject->variant.file_variant.shrink_size = 0xFFFFFFFF;	/* max __u32 */
+			theObject->variant.file_variant.top_level = 0;
+			theObject->variant.file_variant.top = tn;
 			break;
 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
+			YINIT_LIST_HEAD(&theObject->variant.dir_variant.
 					children);
-			YINIT_LIST_HEAD(&theObject->variant.directoryVariant.
+			YINIT_LIST_HEAD(&theObject->variant.dir_variant.
 					dirty);
 			break;
 		case YAFFS_OBJECT_TYPE_SYMLINK:
@@ -1506,11 +1506,11 @@ yaffs_Object *yaffs_new_obj(yaffs_Device *dev, int number,
 	return theObject;
 }
 
-yaffs_Object *yaffs_find_or_create_by_number(yaffs_Device *dev,
+yaffs_obj_t *yaffs_find_or_create_by_number(yaffs_dev_t *dev,
 						int number,
-						yaffs_ObjectType type)
+						yaffs_obj_type type)
 {
-	yaffs_Object *theObject = NULL;
+	yaffs_obj_t *theObject = NULL;
 
 	if (number > 0)
 		theObject = yaffs_find_by_number(dev, number);
@@ -1543,24 +1543,24 @@ YCHAR *yaffs_clone_str(const YCHAR *str)
 
 /*
  * Mknod (create) a new object.
- * equivalentObject only has meaning for a hard link;
+ * equiv_obj only has meaning for a hard link;
  * aliasString only has meaning for a symlink.
  * rdev only has meaning for devices (a subset of special objects)
  */
 
-static yaffs_Object *yaffs_create_obj(yaffs_ObjectType type,
-				       yaffs_Object *parent,
+static yaffs_obj_t *yaffs_create_obj(yaffs_obj_type type,
+				       yaffs_obj_t *parent,
 				       const YCHAR *name,
 				       __u32 mode,
 				       __u32 uid,
 				       __u32 gid,
-				       yaffs_Object *equivalentObject,
+				       yaffs_obj_t *equiv_obj,
 				       const YCHAR *aliasString, __u32 rdev)
 {
-	yaffs_Object *in;
+	yaffs_obj_t *in;
 	YCHAR *str = NULL;
 
-	yaffs_Device *dev = parent->myDev;
+	yaffs_dev_t *dev = parent->my_dev;
 
 	/* Check if the entry exists. If it does then fail the call since we don't want a dup.*/
 	if (yaffs_find_by_name(parent, name))
@@ -1585,9 +1585,9 @@ static yaffs_Object *yaffs_create_obj(yaffs_ObjectType type,
 
 
 	if (in) {
-		in->hdrChunk = 0;
+		in->hdr_chunk = 0;
 		in->valid = 1;
-		in->variantType = type;
+		in->variant_type = type;
 
 		in->yst_mode = mode;
 
@@ -1603,25 +1603,25 @@ static yaffs_Object *yaffs_create_obj(yaffs_ObjectType type,
 		in->yst_uid = uid;
 		in->yst_gid = gid;
 #endif
-		in->nDataChunks = 0;
+		in->n_data_chunks = 0;
 
 		yaffs_set_obj_name(in, name);
 		in->dirty = 1;
 
 		yaffs_add_obj_to_dir(parent, in);
 
-		in->myDev = parent->myDev;
+		in->my_dev = parent->my_dev;
 
 		switch (type) {
 		case YAFFS_OBJECT_TYPE_SYMLINK:
-			in->variant.symLinkVariant.alias = str;
+			in->variant.symlink_variant.alias = str;
 			break;
 		case YAFFS_OBJECT_TYPE_HARDLINK:
-			in->variant.hardLinkVariant.equivalentObject =
-				equivalentObject;
-			in->variant.hardLinkVariant.equivalentObjectId =
-				equivalentObject->objectId;
-			ylist_add(&in->hardLinks, &equivalentObject->hardLinks);
+			in->variant.hardlink_variant.equiv_obj =
+				equiv_obj;
+			in->variant.hardlink_variant.equiv_id =
+				equiv_obj->obj_id;
+			ylist_add(&in->hard_links, &equiv_obj->hard_links);
 			break;
 		case YAFFS_OBJECT_TYPE_FILE:
 		case YAFFS_OBJECT_TYPE_DIRECTORY:
@@ -1643,28 +1643,28 @@ static yaffs_Object *yaffs_create_obj(yaffs_ObjectType type,
 	return in;
 }
 
-yaffs_Object *yaffs_create_file(yaffs_Object *parent, const YCHAR *name,
+yaffs_obj_t *yaffs_create_file(yaffs_obj_t *parent, const YCHAR *name,
 			__u32 mode, __u32 uid, __u32 gid)
 {
 	return yaffs_create_obj(YAFFS_OBJECT_TYPE_FILE, parent, name, mode,
 				uid, gid, NULL, NULL, 0);
 }
 
-yaffs_Object *yaffs_create_dir(yaffs_Object *parent, const YCHAR *name,
+yaffs_obj_t *yaffs_create_dir(yaffs_obj_t *parent, const YCHAR *name,
 				__u32 mode, __u32 uid, __u32 gid)
 {
 	return yaffs_create_obj(YAFFS_OBJECT_TYPE_DIRECTORY, parent, name,
 				 mode, uid, gid, NULL, NULL, 0);
 }
 
-yaffs_Object *yaffs_create_special(yaffs_Object *parent, const YCHAR *name,
+yaffs_obj_t *yaffs_create_special(yaffs_obj_t *parent, const YCHAR *name,
 				__u32 mode, __u32 uid, __u32 gid, __u32 rdev)
 {
 	return yaffs_create_obj(YAFFS_OBJECT_TYPE_SPECIAL, parent, name, mode,
 				 uid, gid, NULL, NULL, rdev);
 }
 
-yaffs_Object *yaffs_create_symlink(yaffs_Object *parent, const YCHAR *name,
+yaffs_obj_t *yaffs_create_symlink(yaffs_obj_t *parent, const YCHAR *name,
 				__u32 mode, __u32 uid, __u32 gid,
 				const YCHAR *alias)
 {
@@ -1672,52 +1672,52 @@ yaffs_Object *yaffs_create_symlink(yaffs_Object *parent, const YCHAR *name,
 				uid, gid, NULL, alias, 0);
 }
 
-/* yaffs_Link returns the object id of the equivalent object.*/
-yaffs_Object *yaffs_Link(yaffs_Object *parent, const YCHAR *name,
-			yaffs_Object *equivalentObject)
+/* yaffs_link_obj returns the object id of the equivalent object.*/
+yaffs_obj_t *yaffs_link_obj(yaffs_obj_t *parent, const YCHAR *name,
+			yaffs_obj_t *equiv_obj)
 {
 	/* Get the real object in case we were fed a hard link as an equivalent object */
-	equivalentObject = yaffs_get_equivalent_obj(equivalentObject);
+	equiv_obj = yaffs_get_equivalent_obj(equiv_obj);
 
 	if (yaffs_create_obj
 	    (YAFFS_OBJECT_TYPE_HARDLINK, parent, name, 0, 0, 0,
-	     equivalentObject, NULL, 0)) {
-		return equivalentObject;
+	     equiv_obj, NULL, 0)) {
+		return equiv_obj;
 	} else {
 		return NULL;
 	}
 
 }
 
-static int yaffs_change_obj_name(yaffs_Object *obj, yaffs_Object *newDir,
-				const YCHAR *newName, int force, int shadows)
+static int yaffs_change_obj_name(yaffs_obj_t *obj, yaffs_obj_t *new_dir,
+				const YCHAR *new_name, int force, int shadows)
 {
 	int unlinkOp;
 	int deleteOp;
 
-	yaffs_Object *existingTarget;
+	yaffs_obj_t *existingTarget;
 
-	if (newDir == NULL)
-		newDir = obj->parent;	/* use the old directory */
+	if (new_dir == NULL)
+		new_dir = obj->parent;	/* use the old directory */
 
-	if (newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+	if (new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
 		T(YAFFS_TRACE_ALWAYS,
 		  (TSTR
-		   ("tragedy: yaffs_change_obj_name: newDir is not a directory"
+		   ("tragedy: yaffs_change_obj_name: new_dir is not a directory"
 		    TENDSTR)));
 		YBUG();
 	}
 
 	/* TODO: Do we need this different handling for YAFFS2 and YAFFS1?? */
-	if (obj->myDev->param.isYaffs2)
-		unlinkOp = (newDir == obj->myDev->unlinkedDir);
+	if (obj->my_dev->param.is_yaffs2)
+		unlinkOp = (new_dir == obj->my_dev->unlinked_dir);
 	else
-		unlinkOp = (newDir == obj->myDev->unlinkedDir
-			    && obj->variantType == YAFFS_OBJECT_TYPE_FILE);
+		unlinkOp = (new_dir == obj->my_dev->unlinked_dir
+			    && obj->variant_type == YAFFS_OBJECT_TYPE_FILE);
 
-	deleteOp = (newDir == obj->myDev->deletedDir);
+	deleteOp = (new_dir == obj->my_dev->del_dir);
 
-	existingTarget = yaffs_find_by_name(newDir, newName);
+	existingTarget = yaffs_find_by_name(new_dir, new_name);
 
 	/* If the object is a file going into the unlinked directory,
 	 *   then it is OK to just stuff it in since duplicate names are allowed.
@@ -1729,63 +1729,63 @@ static int yaffs_change_obj_name(yaffs_Object *obj, yaffs_Object *newDir,
 	     force ||
 	     (shadows > 0) ||
 	     !existingTarget) &&
-	    newDir->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) {
-		yaffs_set_obj_name(obj, newName);
+	    new_dir->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) {
+		yaffs_set_obj_name(obj, new_name);
 		obj->dirty = 1;
 
-		yaffs_add_obj_to_dir(newDir, obj);
+		yaffs_add_obj_to_dir(new_dir, obj);
 
 		if (unlinkOp)
 			obj->unlinked = 1;
 
 		/* If it is a deletion then we mark it as a shrink for gc purposes. */
-		if (yaffs_update_oh(obj, newName, 0, deleteOp, shadows, NULL) >= 0)
+		if (yaffs_update_oh(obj, new_name, 0, deleteOp, shadows, NULL) >= 0)
 			return YAFFS_OK;
 	}
 
 	return YAFFS_FAIL;
 }
 
-int yaffs_rename_obj(yaffs_Object *oldDir, const YCHAR *oldName,
-		yaffs_Object *newDir, const YCHAR *newName)
+int yaffs_rename_obj(yaffs_obj_t *old_dir, const YCHAR *old_name,
+		yaffs_obj_t *new_dir, const YCHAR *new_name)
 {
-	yaffs_Object *obj = NULL;
-	yaffs_Object *existingTarget = NULL;
+	yaffs_obj_t *obj = NULL;
+	yaffs_obj_t *existingTarget = NULL;
 	int force = 0;
 	int result;
-	yaffs_Device *dev;
+	yaffs_dev_t *dev;
 
 
-	if (!oldDir || oldDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+	if (!old_dir || old_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
 		YBUG();
-	if (!newDir || newDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+	if (!new_dir || new_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
 		YBUG();
 
-	dev = oldDir->myDev;
+	dev = old_dir->my_dev;
 
 #ifdef CONFIG_YAFFS_CASE_INSENSITIVE
 	/* Special case for case insemsitive systems (eg. WinCE).
 	 * While look-up is case insensitive, the name isn't.
 	 * Therefore we might want to change x.txt to X.txt
 	*/
-	if (oldDir == newDir && yaffs_strcmp(oldName, newName) == 0)
+	if (old_dir == new_dir && yaffs_strcmp(old_name, new_name) == 0)
 		force = 1;
 #endif
 
-	if(yaffs_strnlen(newName,YAFFS_MAX_NAME_LENGTH+1) > YAFFS_MAX_NAME_LENGTH)
+	if(yaffs_strnlen(new_name,YAFFS_MAX_NAME_LENGTH+1) > YAFFS_MAX_NAME_LENGTH)
 		/* ENAMETOOLONG */
 		return YAFFS_FAIL;
 
-	obj = yaffs_find_by_name(oldDir, oldName);
+	obj = yaffs_find_by_name(old_dir, old_name);
 
-	if (obj && obj->renameAllowed) {
+	if (obj && obj->rename_allowed) {
 
 		/* Now do the handling for an existing target, if there is one */
 
-		existingTarget = yaffs_find_by_name(newDir, newName);
+		existingTarget = yaffs_find_by_name(new_dir, new_name);
 		if (existingTarget &&
-			existingTarget->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
-			!ylist_empty(&existingTarget->variant.directoryVariant.children)) {
+			existingTarget->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
+			!ylist_empty(&existingTarget->variant.dir_variant.children)) {
 			/* There is a target that is a non-empty directory, so we fail */
 			return YAFFS_FAIL;	/* EEXIST or ENOTEMPTY */
 		} else if (existingTarget && existingTarget != obj) {
@@ -1795,19 +1795,19 @@ int yaffs_rename_obj(yaffs_Object *oldDir, const YCHAR *oldName,
 			 * Note we must disable gc otherwise it can mess up the shadowing.
 			 *
 			 */
-			dev->gcDisable=1;
-			yaffs_change_obj_name(obj, newDir, newName, force,
-						existingTarget->objectId);
-			existingTarget->isShadowed = 1;
+			dev->gc_disable=1;
+			yaffs_change_obj_name(obj, new_dir, new_name, force,
+						existingTarget->obj_id);
+			existingTarget->is_shadowed = 1;
 			yaffs_unlink_obj(existingTarget);
-			dev->gcDisable=0;
+			dev->gc_disable=0;
 		}
 
-		result = yaffs_change_obj_name(obj, newDir, newName, 1, 0);
+		result = yaffs_change_obj_name(obj, new_dir, new_name, 1, 0);
 
-		yaffs_update_parent(oldDir);
-		if(newDir != oldDir)
-			yaffs_update_parent(newDir);
+		yaffs_update_parent(old_dir);
+		if(new_dir != old_dir)
+			yaffs_update_parent(new_dir);
 		
 		return result;
 	}
@@ -1816,65 +1816,65 @@ int yaffs_rename_obj(yaffs_Object *oldDir, const YCHAR *oldName,
 
 /*------------------------- Block Management and Page Allocation ----------------*/
 
-static int yaffs_init_blocks(yaffs_Device *dev)
+static int yaffs_init_blocks(yaffs_dev_t *dev)
 {
-	int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
+	int nBlocks = dev->internal_end_block - dev->internal_start_block + 1;
 
-	dev->blockInfo = NULL;
-	dev->chunkBits = NULL;
+	dev->block_info = NULL;
+	dev->chunk_bits = NULL;
 
-	dev->allocationBlock = -1;	/* force it to get a new one */
+	dev->alloc_block = -1;	/* force it to get a new one */
 
 	/* If the first allocation strategy fails, thry the alternate one */
-	dev->blockInfo = YMALLOC(nBlocks * sizeof(yaffs_BlockInfo));
-	if (!dev->blockInfo) {
-		dev->blockInfo = YMALLOC_ALT(nBlocks * sizeof(yaffs_BlockInfo));
-		dev->blockInfoAlt = 1;
+	dev->block_info = YMALLOC(nBlocks * sizeof(yaffs_block_info_t));
+	if (!dev->block_info) {
+		dev->block_info = YMALLOC_ALT(nBlocks * sizeof(yaffs_block_info_t));
+		dev->block_info_alt = 1;
 	} else
-		dev->blockInfoAlt = 0;
+		dev->block_info_alt = 0;
 
-	if (dev->blockInfo) {
+	if (dev->block_info) {
 		/* Set up dynamic blockinfo stuff. */
-		dev->chunkBitmapStride = (dev->param.nChunksPerBlock + 7) / 8; /* round up bytes */
-		dev->chunkBits = YMALLOC(dev->chunkBitmapStride * nBlocks);
-		if (!dev->chunkBits) {
-			dev->chunkBits = YMALLOC_ALT(dev->chunkBitmapStride * nBlocks);
-			dev->chunkBitsAlt = 1;
+		dev->chunk_bit_stride = (dev->param.chunks_per_block + 7) / 8; /* round up bytes */
+		dev->chunk_bits = YMALLOC(dev->chunk_bit_stride * nBlocks);
+		if (!dev->chunk_bits) {
+			dev->chunk_bits = YMALLOC_ALT(dev->chunk_bit_stride * nBlocks);
+			dev->chunk_bits_alt = 1;
 		} else
-			dev->chunkBitsAlt = 0;
+			dev->chunk_bits_alt = 0;
 	}
 
-	if (dev->blockInfo && dev->chunkBits) {
-		memset(dev->blockInfo, 0, nBlocks * sizeof(yaffs_BlockInfo));
-		memset(dev->chunkBits, 0, dev->chunkBitmapStride * nBlocks);
+	if (dev->block_info && dev->chunk_bits) {
+		memset(dev->block_info, 0, nBlocks * sizeof(yaffs_block_info_t));
+		memset(dev->chunk_bits, 0, dev->chunk_bit_stride * nBlocks);
 		return YAFFS_OK;
 	}
 
 	return YAFFS_FAIL;
 }
 
-static void yaffs_deinit_blocks(yaffs_Device *dev)
+static void yaffs_deinit_blocks(yaffs_dev_t *dev)
 {
-	if (dev->blockInfoAlt && dev->blockInfo)
-		YFREE_ALT(dev->blockInfo);
-	else if (dev->blockInfo)
-		YFREE(dev->blockInfo);
+	if (dev->block_info_alt && dev->block_info)
+		YFREE_ALT(dev->block_info);
+	else if (dev->block_info)
+		YFREE(dev->block_info);
 
-	dev->blockInfoAlt = 0;
+	dev->block_info_alt = 0;
 
-	dev->blockInfo = NULL;
+	dev->block_info = NULL;
 
-	if (dev->chunkBitsAlt && dev->chunkBits)
-		YFREE_ALT(dev->chunkBits);
-	else if (dev->chunkBits)
-		YFREE(dev->chunkBits);
-	dev->chunkBitsAlt = 0;
-	dev->chunkBits = NULL;
+	if (dev->chunk_bits_alt && dev->chunk_bits)
+		YFREE_ALT(dev->chunk_bits);
+	else if (dev->chunk_bits)
+		YFREE(dev->chunk_bits);
+	dev->chunk_bits_alt = 0;
+	dev->chunk_bits = NULL;
 }
 
-void yaffs_block_became_dirty(yaffs_Device *dev, int blockNo)
+void yaffs_block_became_dirty(yaffs_dev_t *dev, int block_no)
 {
-	yaffs_BlockInfo *bi = yaffs_get_block_info(dev, blockNo);
+	yaffs_block_info_t *bi = yaffs_get_block_info(dev, block_no);
 
 	int erasedOk = 0;
 
@@ -1884,76 +1884,76 @@ void yaffs_block_became_dirty(yaffs_Device *dev, int blockNo)
 
 	T(YAFFS_TRACE_GC | YAFFS_TRACE_ERASE,
 		(TSTR("yaffs_block_became_dirty block %d state %d %s"TENDSTR),
-		blockNo, bi->blockState, (bi->needsRetiring) ? "needs retiring" : ""));
+		block_no, bi->block_state, (bi->needs_retiring) ? "needs retiring" : ""));
 
 	yaffs2_clear_oldest_dirty_seq(dev,bi);
 
-	bi->blockState = YAFFS_BLOCK_STATE_DIRTY;
+	bi->block_state = YAFFS_BLOCK_STATE_DIRTY;
 
 	/* If this is the block being garbage collected then stop gc'ing this block */
-	if(blockNo == dev->gcBlock)
-		dev->gcBlock = 0;
+	if(block_no == dev->gc_block)
+		dev->gc_block = 0;
 
 	/* If this block is currently the best candidate for gc then drop as a candidate */
-	if(blockNo == dev->gcDirtiest){
-		dev->gcDirtiest = 0;
-		dev->gcPagesInUse = 0;
+	if(block_no == dev->gc_dirtiest){
+		dev->gc_dirtiest = 0;
+		dev->gc_pages_in_use = 0;
 	}
 
-	if (!bi->needsRetiring) {
+	if (!bi->needs_retiring) {
 		yaffs2_checkpt_invalidate(dev);
-		erasedOk = yaffs_erase_block(dev, blockNo);
+		erasedOk = yaffs_erase_block(dev, block_no);
 		if (!erasedOk) {
-			dev->nErasureFailures++;
+			dev->n_erase_failures++;
 			T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-			  (TSTR("**>> Erasure failed %d" TENDSTR), blockNo));
+			  (TSTR("**>> Erasure failed %d" TENDSTR), block_no));
 		}
 	}
 
 	if (erasedOk &&
 	    ((yaffs_trace_mask & YAFFS_TRACE_ERASE) || !yaffs_skip_verification(dev))) {
 		int i;
-		for (i = 0; i < dev->param.nChunksPerBlock; i++) {
+		for (i = 0; i < dev->param.chunks_per_block; i++) {
 			if (!yaffs_check_chunk_erased
-			    (dev, blockNo * dev->param.nChunksPerBlock + i)) {
+			    (dev, block_no * dev->param.chunks_per_block + i)) {
 				T(YAFFS_TRACE_ERROR,
 				  (TSTR
 				   (">>Block %d erasure supposedly OK, but chunk %d not erased"
-				    TENDSTR), blockNo, i));
+				    TENDSTR), block_no, i));
 			}
 		}
 	}
 
 	if (erasedOk) {
 		/* Clean it up... */
-		bi->blockState = YAFFS_BLOCK_STATE_EMPTY;
-		bi->sequenceNumber = 0;
-		dev->nErasedBlocks++;
-		bi->pagesInUse = 0;
-		bi->softDeletions = 0;
-		bi->hasShrinkHeader = 0;
-		bi->skipErasedCheck = 1;  /* This is clean, so no need to check */
-		bi->gcPrioritise = 0;
-		yaffs_clear_chunk_bits(dev, blockNo);
+		bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
+		bi->seq_number = 0;
+		dev->n_erased_blocks++;
+		bi->pages_in_use = 0;
+		bi->soft_del_pages = 0;
+		bi->has_shrink_hdr = 0;
+		bi->skip_erased_check = 1;  /* This is clean, so no need to check */
+		bi->gc_prioritise = 0;
+		yaffs_clear_chunk_bits(dev, block_no);
 
 		T(YAFFS_TRACE_ERASE,
-		  (TSTR("Erased block %d" TENDSTR), blockNo));
+		  (TSTR("Erased block %d" TENDSTR), block_no));
 	} else {
-		dev->nFreeChunks -= dev->param.nChunksPerBlock;	/* We lost a block of free space */
+		dev->n_free_chunks -= dev->param.chunks_per_block;	/* We lost a block of free space */
 
-		yaffs_retire_block(dev, blockNo);
+		yaffs_retire_block(dev, block_no);
 		T(YAFFS_TRACE_ERROR | YAFFS_TRACE_BAD_BLOCKS,
-		  (TSTR("**>> Block %d retired" TENDSTR), blockNo));
+		  (TSTR("**>> Block %d retired" TENDSTR), block_no));
 	}
 }
 
-static int yaffs_find_alloc_block(yaffs_Device *dev)
+static int yaffs_find_alloc_block(yaffs_dev_t *dev)
 {
 	int i;
 
-	yaffs_BlockInfo *bi;
+	yaffs_block_info_t *bi;
 
-	if (dev->nErasedBlocks < 1) {
+	if (dev->n_erased_blocks < 1) {
 		/* Hoosterman we've got a problem.
 		 * Can't get space to gc
 		 */
@@ -1965,32 +1965,32 @@ static int yaffs_find_alloc_block(yaffs_Device *dev)
 
 	/* Find an empty block. */
 
-	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-		dev->allocationBlockFinder++;
-		if (dev->allocationBlockFinder < dev->internalStartBlock
-		    || dev->allocationBlockFinder > dev->internalEndBlock) {
-			dev->allocationBlockFinder = dev->internalStartBlock;
+	for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) {
+		dev->alloc_block_finder++;
+		if (dev->alloc_block_finder < dev->internal_start_block
+		    || dev->alloc_block_finder > dev->internal_end_block) {
+			dev->alloc_block_finder = dev->internal_start_block;
 		}
 
-		bi = yaffs_get_block_info(dev, dev->allocationBlockFinder);
+		bi = yaffs_get_block_info(dev, dev->alloc_block_finder);
 
-		if (bi->blockState == YAFFS_BLOCK_STATE_EMPTY) {
-			bi->blockState = YAFFS_BLOCK_STATE_ALLOCATING;
-			dev->sequenceNumber++;
-			bi->sequenceNumber = dev->sequenceNumber;
-			dev->nErasedBlocks--;
+		if (bi->block_state == YAFFS_BLOCK_STATE_EMPTY) {
+			bi->block_state = YAFFS_BLOCK_STATE_ALLOCATING;
+			dev->seq_number++;
+			bi->seq_number = dev->seq_number;
+			dev->n_erased_blocks--;
 			T(YAFFS_TRACE_ALLOCATE,
 			  (TSTR("Allocated block %d, seq  %d, %d left" TENDSTR),
-			   dev->allocationBlockFinder, dev->sequenceNumber,
-			   dev->nErasedBlocks));
-			return dev->allocationBlockFinder;
+			   dev->alloc_block_finder, dev->seq_number,
+			   dev->n_erased_blocks));
+			return dev->alloc_block_finder;
 		}
 	}
 
 	T(YAFFS_TRACE_ALWAYS,
 	  (TSTR
 	   ("yaffs tragedy: no more erased blocks, but there should have been %d"
-	    TENDSTR), dev->nErasedBlocks));
+	    TENDSTR), dev->n_erased_blocks));
 
 	return -1;
 }
@@ -2000,29 +2000,29 @@ static int yaffs_find_alloc_block(yaffs_Device *dev)
  * Check if there's space to allocate...
  * Thinks.... do we need top make this ths same as yaffs_get_free_chunks()?
  */
-int yaffs_check_alloc_available(yaffs_Device *dev, int nChunks)
+int yaffs_check_alloc_available(yaffs_dev_t *dev, int n_chunks)
 {
 	int reservedChunks;
-	int reservedBlocks = dev->param.nReservedBlocks;
+	int reservedBlocks = dev->param.n_reserved_blocks;
 	int checkpointBlocks;
 
 	checkpointBlocks = yaffs_calc_checkpt_blocks_required(dev);
 
-	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->param.nChunksPerBlock);
+	reservedChunks = ((reservedBlocks + checkpointBlocks) * dev->param.chunks_per_block);
 
-	return (dev->nFreeChunks > (reservedChunks + nChunks));
+	return (dev->n_free_chunks > (reservedChunks + n_chunks));
 }
 
-static int yaffs_alloc_chunk(yaffs_Device *dev, int useReserve,
-		yaffs_BlockInfo **blockUsedPtr)
+static int yaffs_alloc_chunk(yaffs_dev_t *dev, int useReserve,
+		yaffs_block_info_t **blockUsedPtr)
 {
 	int retVal;
-	yaffs_BlockInfo *bi;
+	yaffs_block_info_t *bi;
 
-	if (dev->allocationBlock < 0) {
+	if (dev->alloc_block < 0) {
 		/* Get next block to allocate off */
-		dev->allocationBlock = yaffs_find_alloc_block(dev);
-		dev->allocationPage = 0;
+		dev->alloc_block = yaffs_find_alloc_block(dev);
+		dev->alloc_page = 0;
 	}
 
 	if (!useReserve && !yaffs_check_alloc_available(dev, 1)) {
@@ -2030,29 +2030,29 @@ static int yaffs_alloc_chunk(yaffs_Device *dev, int useReserve,
 		return -1;
 	}
 
-	if (dev->nErasedBlocks < dev->param.nReservedBlocks
-			&& dev->allocationPage == 0) {
+	if (dev->n_erased_blocks < dev->param.n_reserved_blocks
+			&& dev->alloc_page == 0) {
 		T(YAFFS_TRACE_ALLOCATE, (TSTR("Allocating reserve" TENDSTR)));
 	}
 
 	/* Next page please.... */
-	if (dev->allocationBlock >= 0) {
-		bi = yaffs_get_block_info(dev, dev->allocationBlock);
+	if (dev->alloc_block >= 0) {
+		bi = yaffs_get_block_info(dev, dev->alloc_block);
 
-		retVal = (dev->allocationBlock * dev->param.nChunksPerBlock) +
-			dev->allocationPage;
-		bi->pagesInUse++;
-		yaffs_set_chunk_bit(dev, dev->allocationBlock,
-				dev->allocationPage);
+		retVal = (dev->alloc_block * dev->param.chunks_per_block) +
+			dev->alloc_page;
+		bi->pages_in_use++;
+		yaffs_set_chunk_bit(dev, dev->alloc_block,
+				dev->alloc_page);
 
-		dev->allocationPage++;
+		dev->alloc_page++;
 
-		dev->nFreeChunks--;
+		dev->n_free_chunks--;
 
 		/* If the block is full set the state to full */
-		if (dev->allocationPage >= dev->param.nChunksPerBlock) {
-			bi->blockState = YAFFS_BLOCK_STATE_FULL;
-			dev->allocationBlock = -1;
+		if (dev->alloc_page >= dev->param.chunks_per_block) {
+			bi->block_state = YAFFS_BLOCK_STATE_FULL;
+			dev->alloc_block = -1;
 		}
 
 		if (blockUsedPtr)
@@ -2067,14 +2067,14 @@ static int yaffs_alloc_chunk(yaffs_Device *dev, int useReserve,
 	return -1;
 }
 
-static int yaffs_get_erased_chunks(yaffs_Device *dev)
+static int yaffs_get_erased_chunks(yaffs_dev_t *dev)
 {
 	int n;
 
-	n = dev->nErasedBlocks * dev->param.nChunksPerBlock;
+	n = dev->n_erased_blocks * dev->param.chunks_per_block;
 
-	if (dev->allocationBlock > 0)
-		n += (dev->param.nChunksPerBlock - dev->allocationPage);
+	if (dev->alloc_block > 0)
+		n += (dev->param.chunks_per_block - dev->alloc_page);
 
 	return n;
 
@@ -2084,24 +2084,24 @@ static int yaffs_get_erased_chunks(yaffs_Device *dev)
  * yaffs_skip_rest_of_block() skips over the rest of the allocation block
  * if we don't want to write to it.
  */
-void yaffs_skip_rest_of_block(yaffs_Device *dev)
+void yaffs_skip_rest_of_block(yaffs_dev_t *dev)
 {
-	if(dev->allocationBlock > 0){
-		yaffs_BlockInfo *bi = yaffs_get_block_info(dev, dev->allocationBlock);
-		if(bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING){
-			bi->blockState = YAFFS_BLOCK_STATE_FULL;
-			dev->allocationBlock = -1;
+	if(dev->alloc_block > 0){
+		yaffs_block_info_t *bi = yaffs_get_block_info(dev, dev->alloc_block);
+		if(bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING){
+			bi->block_state = YAFFS_BLOCK_STATE_FULL;
+			dev->alloc_block = -1;
 		}
 	}
 }
 
 
-static int yaffs_gc_block(yaffs_Device *dev, int block,
+static int yaffs_gc_block(yaffs_dev_t *dev, int block,
 		int wholeBlock)
 {
 	int oldChunk;
 	int newChunk;
-	int markNAND;
+	int mark_flash;
 	int retVal = YAFFS_OK;
 	int i;
 	int isCheckpointBlock;
@@ -2111,30 +2111,30 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
 	int chunksBefore = yaffs_get_erased_chunks(dev);
 	int chunksAfter;
 
-	yaffs_ExtendedTags tags;
+	yaffs_ext_tags tags;
 
-	yaffs_BlockInfo *bi = yaffs_get_block_info(dev, block);
+	yaffs_block_info_t *bi = yaffs_get_block_info(dev, block);
 
-	yaffs_Object *object;
+	yaffs_obj_t *object;
 
-	isCheckpointBlock = (bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT);
+	isCheckpointBlock = (bi->block_state == YAFFS_BLOCK_STATE_CHECKPOINT);
 
 
 	T(YAFFS_TRACE_TRACING,
 			(TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR),
 			 block,
-			 bi->pagesInUse,
-			 bi->hasShrinkHeader,
+			 bi->pages_in_use,
+			 bi->has_shrink_hdr,
 			 wholeBlock));
 
 	/*yaffs_verify_free_chunks(dev); */
 
-	if(bi->blockState == YAFFS_BLOCK_STATE_FULL)
-		bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
+	if(bi->block_state == YAFFS_BLOCK_STATE_FULL)
+		bi->block_state = YAFFS_BLOCK_STATE_COLLECTING;
 	
-	bi->hasShrinkHeader = 0;	/* clear the flag so that the block can erase */
+	bi->has_shrink_hdr = 0;	/* clear the flag so that the block can erase */
 
-	dev->gcDisable = 1;
+	dev->gc_disable = 1;
 
 	if (isCheckpointBlock ||
 			!yaffs_still_some_chunks(dev, block)) {
@@ -2149,22 +2149,22 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
 
 		yaffs_verify_blk(dev, bi, block);
 
-		maxCopies = (wholeBlock) ? dev->param.nChunksPerBlock : 5;
-		oldChunk = block * dev->param.nChunksPerBlock + dev->gcChunk;
+		maxCopies = (wholeBlock) ? dev->param.chunks_per_block : 5;
+		oldChunk = block * dev->param.chunks_per_block + dev->gc_chunk;
 
 		for (/* init already done */;
 		     retVal == YAFFS_OK &&
-		     dev->gcChunk < dev->param.nChunksPerBlock &&
-		     (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) &&
+		     dev->gc_chunk < dev->param.chunks_per_block &&
+		     (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) &&
 		     maxCopies > 0;
-		     dev->gcChunk++, oldChunk++) {
-			if (yaffs_check_chunk_bit(dev, block, dev->gcChunk)) {
+		     dev->gc_chunk++, oldChunk++) {
+			if (yaffs_check_chunk_bit(dev, block, dev->gc_chunk)) {
 
 				/* This page is in use and might need to be copied off */
 
 				maxCopies--;
 
-				markNAND = 1;
+				mark_flash = 1;
 
 				yaffs_init_tags(&tags);
 
@@ -2173,26 +2173,26 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
 
 				object =
 				    yaffs_find_by_number(dev,
-							     tags.objectId);
+							     tags.obj_id);
 
 				T(YAFFS_TRACE_GC_DETAIL,
 				  (TSTR
 				   ("Collecting chunk in block %d, %d %d %d " TENDSTR),
-				   dev->gcChunk, tags.objectId, tags.chunkId,
-				   tags.byteCount));
+				   dev->gc_chunk, tags.obj_id, tags.chunk_id,
+				   tags.n_bytes));
 
 				if (object && !yaffs_skip_verification(dev)) {
-					if (tags.chunkId == 0)
-						matchingChunk = object->hdrChunk;
-					else if (object->softDeleted)
+					if (tags.chunk_id == 0)
+						matchingChunk = object->hdr_chunk;
+					else if (object->soft_del)
 						matchingChunk = oldChunk; /* Defeat the test */
 					else
-						matchingChunk = yaffs_find_chunk_in_file(object, tags.chunkId, NULL);
+						matchingChunk = yaffs_find_chunk_in_file(object, tags.chunk_id, NULL);
 
 					if (oldChunk != matchingChunk)
 						T(YAFFS_TRACE_ERROR,
 						  (TSTR("gc: page in gc mismatch: %d %d %d %d"TENDSTR),
-						  oldChunk, matchingChunk, tags.objectId, tags.chunkId));
+						  oldChunk, matchingChunk, tags.obj_id, tags.chunk_id));
 
 				}
 
@@ -2201,13 +2201,13 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
 					  (TSTR
 					   ("page %d in gc has no object: %d %d %d "
 					    TENDSTR), oldChunk,
-					    tags.objectId, tags.chunkId, tags.byteCount));
+					    tags.obj_id, tags.chunk_id, tags.n_bytes));
 				}
 
 				if (object &&
 				    object->deleted &&
-				    object->softDeleted &&
-				    tags.chunkId != 0) {
+				    object->soft_del &&
+				    tags.chunk_id != 0) {
 					/* Data chunk in a soft deleted file, throw it away
 					 * It's a soft deleted data chunk,
 					 * No need to copy this, just forget about it and
@@ -2219,28 +2219,28 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
 					 * which will increment free chunks.
 					 * We have to decrement free chunks so this works out properly.
 					 */
-					dev->nFreeChunks--;
-					bi->softDeletions--;
+					dev->n_free_chunks--;
+					bi->soft_del_pages--;
 
-					object->nDataChunks--;
+					object->n_data_chunks--;
 
-					if (object->nDataChunks <= 0) {
+					if (object->n_data_chunks <= 0) {
 						/* remeber to clean up the object */
-						dev->gcCleanupList[dev->nCleanups] =
-						    tags.objectId;
-						dev->nCleanups++;
+						dev->gc_cleanup_list[dev->n_clean_ups] =
+						    tags.obj_id;
+						dev->n_clean_ups++;
 					}
-					markNAND = 0;
+					mark_flash = 0;
 				} else if (0) {
-					/* Todo object && object->deleted && object->nDataChunks == 0 */
+					/* Todo object && object->deleted && object->n_data_chunks == 0 */
 					/* Deleted object header with no data chunks.
 					 * Can be discarded and the file deleted.
 					 */
-					object->hdrChunk = 0;
-					yaffs_free_tnode(object->myDev,
+					object->hdr_chunk = 0;
+					yaffs_free_tnode(object->my_dev,
 							object->variant.
-							fileVariant.top);
-					object->variant.fileVariant.top = NULL;
+							file_variant.top);
+					object->variant.file_variant.top = NULL;
 					yaffs_generic_obj_del(object);
 
 				} else if (object) {
@@ -2249,11 +2249,11 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
 					 * NB Need to keep the ObjectHeaders of deleted files
 					 * until the whole file has been deleted off
 					 */
-					tags.serialNumber++;
+					tags.serial_number++;
 
-					dev->nGCCopies++;
+					dev->n_gc_copies++;
 
-					if (tags.chunkId == 0) {
+					if (tags.chunk_id == 0) {
 						/* It is an object Id,
 						 * We need to nuke the shrinkheader flags first
 						 * Also need to clean up shadowing.
@@ -2261,20 +2261,20 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
 						 * and if it is left in place it will mess up scanning.
 						 */
 
-						yaffs_ObjectHeader *oh;
-						oh = (yaffs_ObjectHeader *)buffer;
+						yaffs_obj_header *oh;
+						oh = (yaffs_obj_header *)buffer;
 
-						oh->isShrink = 0;
-						tags.extraIsShrinkHeader = 0;
+						oh->is_shrink = 0;
+						tags.extra_is_shrink = 0;
 
-						oh->shadowsObject = 0;
-						oh->inbandShadowsObject = 0;
-						tags.extraShadows = 0;
+						oh->shadows_obj = 0;
+						oh->inband_shadowed_obj_id = 0;
+						tags.extra_shadows = 0;
 
 						/* Update file size */
-						if(object->variantType == YAFFS_OBJECT_TYPE_FILE){
-							oh->fileSize = object->variant.fileVariant.fileSize;
-							tags.extraFileLength = oh->fileSize;
+						if(object->variant_type == YAFFS_OBJECT_TYPE_FILE){
+							oh->file_size = object->variant.file_variant.file_size;
+							tags.extra_length = oh->file_size;
 						}
 
 						yaffs_verify_oh(object, oh, &tags, 1);
@@ -2290,23 +2290,23 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
 
 						/* Ok, now fix up the Tnodes etc. */
 
-						if (tags.chunkId == 0) {
+						if (tags.chunk_id == 0) {
 							/* It's a header */
-							object->hdrChunk =  newChunk;
-							object->serial =   tags.serialNumber;
+							object->hdr_chunk =  newChunk;
+							object->serial =   tags.serial_number;
 						} else {
 							/* It's a data chunk */
 							int ok;
 							ok = yaffs_put_chunk_in_file
 							    (object,
-							     tags.chunkId,
+							     tags.chunk_id,
 							     newChunk, 0);
 						}
 					}
 				}
 
 				if (retVal == YAFFS_OK)
-					yaffs_chunk_del(dev, oldChunk, markNAND, __LINE__);
+					yaffs_chunk_del(dev, oldChunk, mark_flash, __LINE__);
 
 			}
 		}
@@ -2321,31 +2321,31 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
 
 
 
-	if (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) {
+	if (bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) {
 		/*
 		 * The gc did not complete. Set block state back to FULL
 		 * because checkpointing does not restore gc.
 		 */
-		bi->blockState = YAFFS_BLOCK_STATE_FULL;
+		bi->block_state = YAFFS_BLOCK_STATE_FULL;
 	} else {
 		/* The gc completed. */
 		/* Do any required cleanups */
-		for (i = 0; i < dev->nCleanups; i++) {
+		for (i = 0; i < dev->n_clean_ups; i++) {
 			/* Time to delete the file too */
 			object =
 			    yaffs_find_by_number(dev,
-						     dev->gcCleanupList[i]);
+						     dev->gc_cleanup_list[i]);
 			if (object) {
 				yaffs_free_tnode(dev,
-						object->variant.fileVariant.
+						object->variant.file_variant.
 						top);
-				object->variant.fileVariant.top = NULL;
+				object->variant.file_variant.top = NULL;
 				T(YAFFS_TRACE_GC,
 				  (TSTR
 				   ("yaffs: About to finally delete object %d"
-				    TENDSTR), object->objectId));
+				    TENDSTR), object->obj_id));
 				yaffs_generic_obj_del(object);
-				object->myDev->nDeletedFiles--;
+				object->my_dev->n_deleted_files--;
 			}
 
 		}
@@ -2358,12 +2358,12 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
 			   ("gc did not increase free chunks before %d after %d"
 			    TENDSTR), chunksBefore, chunksAfter));
 		}
-		dev->gcBlock = 0;
-		dev->gcChunk = 0;
-		dev->nCleanups = 0;
+		dev->gc_block = 0;
+		dev->gc_chunk = 0;
+		dev->n_clean_ups = 0;
 	}
 
-	dev->gcDisable = 0;
+	dev->gc_disable = 0;
 
 	return retVal;
 }
@@ -2373,7 +2373,7 @@ static int yaffs_gc_block(yaffs_Device *dev, int block,
  * for garbage collection.
  */
 
-static unsigned yaffs_find_gc_block(yaffs_Device *dev,
+static unsigned yaffs_find_gc_block(yaffs_dev_t *dev,
 					int aggressive,
 					int background)
 {
@@ -2382,20 +2382,20 @@ static unsigned yaffs_find_gc_block(yaffs_Device *dev,
 	unsigned selected = 0;
 	int prioritised = 0;
 	int prioritisedExists = 0;
-	yaffs_BlockInfo *bi;
+	yaffs_block_info_t *bi;
 	int threshold;
 
 	/* First let's see if we need to grab a prioritised block */
-	if (dev->hasPendingPrioritisedGCs && !aggressive) {
-		dev->gcDirtiest = 0;
-		bi = dev->blockInfo;
-		for (i = dev->internalStartBlock;
-			i <= dev->internalEndBlock && !selected;
+	if (dev->has_pending_prioritised_gc && !aggressive) {
+		dev->gc_dirtiest = 0;
+		bi = dev->block_info;
+		for (i = dev->internal_start_block;
+			i <= dev->internal_end_block && !selected;
 			i++) {
 
-			if (bi->gcPrioritise) {
+			if (bi->gc_prioritise) {
 				prioritisedExists = 1;
-				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
+				if (bi->block_state == YAFFS_BLOCK_STATE_FULL &&
 				   yaffs_block_ok_for_gc(dev, bi)) {
 					selected = i;
 					prioritised = 1;
@@ -2412,11 +2412,11 @@ static unsigned yaffs_find_gc_block(yaffs_Device *dev,
 
 		if(prioritisedExists &&
 			!selected &&
-			dev->oldestDirtyBlock > 0)
-			selected = dev->oldestDirtyBlock;
+			dev->oldest_dirty_block > 0)
+			selected = dev->oldest_dirty_block;
 
 		if (!prioritisedExists) /* None found, so we can clear this */
-			dev->hasPendingPrioritisedGCs = 0;
+			dev->has_pending_prioritised_gc = 0;
 	}
 
 	/* If we're doing aggressive GC then we are happy to take a less-dirty block, and
@@ -2427,23 +2427,23 @@ static unsigned yaffs_find_gc_block(yaffs_Device *dev,
 
 	if (!selected){
 		int pagesUsed;
-		int nBlocks = dev->internalEndBlock - dev->internalStartBlock + 1;
+		int nBlocks = dev->internal_end_block - dev->internal_start_block + 1;
 		if (aggressive){
-			threshold = dev->param.nChunksPerBlock;
+			threshold = dev->param.chunks_per_block;
 			iterations = nBlocks;
 		} else {
 			int maxThreshold;
 
 			if(background)
-				maxThreshold = dev->param.nChunksPerBlock/2;
+				maxThreshold = dev->param.chunks_per_block/2;
 			else
-				maxThreshold = dev->param.nChunksPerBlock/8;
+				maxThreshold = dev->param.chunks_per_block/8;
 
 			if(maxThreshold <  YAFFS_GC_PASSIVE_THRESHOLD)
 				maxThreshold = YAFFS_GC_PASSIVE_THRESHOLD;
 
 			threshold = background ?
-				(dev->gcNotDone + 2) * 2 : 0;
+				(dev->gc_not_done + 2) * 2 : 0;
 			if(threshold <YAFFS_GC_PASSIVE_THRESHOLD)
 				threshold = YAFFS_GC_PASSIVE_THRESHOLD;
 			if(threshold > maxThreshold)
@@ -2456,29 +2456,29 @@ static unsigned yaffs_find_gc_block(yaffs_Device *dev,
 
 		for (i = 0;
 			i < iterations &&
-			(dev->gcDirtiest < 1 ||
-				dev->gcPagesInUse > YAFFS_GC_GOOD_ENOUGH);
+			(dev->gc_dirtiest < 1 ||
+				dev->gc_pages_in_use > YAFFS_GC_GOOD_ENOUGH);
 			i++) {
-			dev->gcBlockFinder++;
-			if (dev->gcBlockFinder < dev->internalStartBlock ||
-				dev->gcBlockFinder > dev->internalEndBlock)
-				dev->gcBlockFinder = dev->internalStartBlock;
+			dev->gc_block_finder++;
+			if (dev->gc_block_finder < dev->internal_start_block ||
+				dev->gc_block_finder > dev->internal_end_block)
+				dev->gc_block_finder = dev->internal_start_block;
 
-			bi = yaffs_get_block_info(dev, dev->gcBlockFinder);
+			bi = yaffs_get_block_info(dev, dev->gc_block_finder);
 
-			pagesUsed = bi->pagesInUse - bi->softDeletions;
+			pagesUsed = bi->pages_in_use - bi->soft_del_pages;
 
-			if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
-				pagesUsed < dev->param.nChunksPerBlock &&
-				(dev->gcDirtiest < 1 || pagesUsed < dev->gcPagesInUse) &&
+			if (bi->block_state == YAFFS_BLOCK_STATE_FULL &&
+				pagesUsed < dev->param.chunks_per_block &&
+				(dev->gc_dirtiest < 1 || pagesUsed < dev->gc_pages_in_use) &&
 				yaffs_block_ok_for_gc(dev, bi)) {
-				dev->gcDirtiest = dev->gcBlockFinder;
-				dev->gcPagesInUse = pagesUsed;
+				dev->gc_dirtiest = dev->gc_block_finder;
+				dev->gc_pages_in_use = pagesUsed;
 			}
 		}
 
-		if(dev->gcDirtiest > 0 && dev->gcPagesInUse <= threshold)
-			selected = dev->gcDirtiest;
+		if(dev->gc_dirtiest > 0 && dev->gc_pages_in_use <= threshold)
+			selected = dev->gc_dirtiest;
 	}
 
 	/*
@@ -2486,43 +2486,43 @@ static unsigned yaffs_find_gc_block(yaffs_Device *dev,
 	 * because that's gumming up the works.
 	 */
 
-	if(!selected && dev->param.isYaffs2 &&
-		dev->gcNotDone >= ( background ? 10 : 20)){
+	if(!selected && dev->param.is_yaffs2 &&
+		dev->gc_not_done >= ( background ? 10 : 20)){
 		yaffs2_find_oldest_dirty_seq(dev);
-		if(dev->oldestDirtyBlock > 0) {
-			selected = dev->oldestDirtyBlock;
-			dev->gcDirtiest = selected;
-			dev->oldestDirtyGCs++;
+		if(dev->oldest_dirty_block > 0) {
+			selected = dev->oldest_dirty_block;
+			dev->gc_dirtiest = selected;
+			dev->oldest_dirty_gc_count++;
 			bi = yaffs_get_block_info(dev, selected);
-			dev->gcPagesInUse =  bi->pagesInUse - bi->softDeletions;
+			dev->gc_pages_in_use =  bi->pages_in_use - bi->soft_del_pages;
 		} else
-			dev->gcNotDone = 0;
+			dev->gc_not_done = 0;
 	}
 
 	if(selected){
 		T(YAFFS_TRACE_GC,
 		  (TSTR("GC Selected block %d with %d free, prioritised:%d" TENDSTR),
 		  selected,
-		  dev->param.nChunksPerBlock - dev->gcPagesInUse,
+		  dev->param.chunks_per_block - dev->gc_pages_in_use,
 		  prioritised));
 
-		dev->nGCBlocks++;
+		dev->n_gc_blocks++;
 		if(background)
-			dev->backgroundGCs++;
+			dev->bg_gcs++;
 
-		dev->gcDirtiest = 0;
-		dev->gcPagesInUse = 0;
-		dev->gcNotDone = 0;
-		if(dev->refreshSkip > 0)
-			dev->refreshSkip--;
+		dev->gc_dirtiest = 0;
+		dev->gc_pages_in_use = 0;
+		dev->gc_not_done = 0;
+		if(dev->refresh_skip > 0)
+			dev->refresh_skip--;
 	} else{
-		dev->gcNotDone++;
+		dev->gc_not_done++;
 		T(YAFFS_TRACE_GC,
 		  (TSTR("GC none: finder %d skip %d threshold %d dirtiest %d using %d oldest %d%s" TENDSTR),
-		  dev->gcBlockFinder, dev->gcNotDone,
+		  dev->gc_block_finder, dev->gc_not_done,
 		  threshold,
-		  dev->gcDirtiest, dev->gcPagesInUse,
-		  dev->oldestDirtyBlock,
+		  dev->gc_dirtiest, dev->gc_pages_in_use,
+		  dev->oldest_dirty_block,
 		  background ? " bg" : ""));
 	}
 
@@ -2538,7 +2538,7 @@ static unsigned yaffs_find_gc_block(yaffs_Device *dev,
  * The idea is to help clear out space in a more spread-out manner.
  * Dunno if it really does anything useful.
  */
-static int yaffs_check_gc(yaffs_Device *dev, int background)
+static int yaffs_check_gc(yaffs_dev_t *dev, int background)
 {
 	int aggressive = 0;
 	int gcOk = YAFFS_OK;
@@ -2547,11 +2547,11 @@ static int yaffs_check_gc(yaffs_Device *dev, int background)
 	int erasedChunks;
 	int checkpointBlockAdjust;
 
-	if(dev->param.gcControl &&
-		(dev->param.gcControl(dev) & 1) == 0)
+	if(dev->param.gc_control &&
+		(dev->param.gc_control(dev) & 1) == 0)
 		return YAFFS_OK;
 
-	if (dev->gcDisable) {
+	if (dev->gc_disable) {
 		/* Bail out so we don't get recursive gc */
 		return YAFFS_OK;
 	}
@@ -2565,64 +2565,64 @@ static int yaffs_check_gc(yaffs_Device *dev, int background)
 
 		checkpointBlockAdjust = yaffs_calc_checkpt_blocks_required(dev);
 
-		minErased  = dev->param.nReservedBlocks + checkpointBlockAdjust + 1;
-		erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock;
+		minErased  = dev->param.n_reserved_blocks + checkpointBlockAdjust + 1;
+		erasedChunks = dev->n_erased_blocks * dev->param.chunks_per_block;
 
 		/* If we need a block soon then do aggressive gc.*/
-		if (dev->nErasedBlocks < minErased)
+		if (dev->n_erased_blocks < minErased)
 			aggressive = 1;
 		else {
-			if(!background && erasedChunks > (dev->nFreeChunks / 4))
+			if(!background && erasedChunks > (dev->n_free_chunks / 4))
 				break;
 
-			if(dev->gcSkip > 20)
-				dev->gcSkip = 20;
-			if(erasedChunks < dev->nFreeChunks/2 ||
-				dev->gcSkip < 1 ||
+			if(dev->gc_skip > 20)
+				dev->gc_skip = 20;
+			if(erasedChunks < dev->n_free_chunks/2 ||
+				dev->gc_skip < 1 ||
 				background)
 				aggressive = 0;
 			else {
-				dev->gcSkip--;
+				dev->gc_skip--;
 				break;
 			}
 		}
 
-		dev->gcSkip = 5;
+		dev->gc_skip = 5;
 
                 /* If we don't already have a block being gc'd then see if we should start another */
 
-		if (dev->gcBlock < 1 && !aggressive) {
-			dev->gcBlock = yaffs2_find_refresh_block(dev);
-			dev->gcChunk = 0;
-			dev->nCleanups=0;
+		if (dev->gc_block < 1 && !aggressive) {
+			dev->gc_block = yaffs2_find_refresh_block(dev);
+			dev->gc_chunk = 0;
+			dev->n_clean_ups=0;
 		}
-		if (dev->gcBlock < 1) {
-			dev->gcBlock = yaffs_find_gc_block(dev, aggressive, background);
-			dev->gcChunk = 0;
-			dev->nCleanups=0;
+		if (dev->gc_block < 1) {
+			dev->gc_block = yaffs_find_gc_block(dev, aggressive, background);
+			dev->gc_chunk = 0;
+			dev->n_clean_ups=0;
 		}
 
-		if (dev->gcBlock > 0) {
-			dev->allGCs++;
+		if (dev->gc_block > 0) {
+			dev->all_gcs++;
 			if (!aggressive)
-				dev->passiveGCs++;
+				dev->passive_gc_count++;
 
 			T(YAFFS_TRACE_GC,
 			  (TSTR
 			   ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
-			   dev->nErasedBlocks, aggressive));
+			   dev->n_erased_blocks, aggressive));
 
-			gcOk = yaffs_gc_block(dev, dev->gcBlock, aggressive);
+			gcOk = yaffs_gc_block(dev, dev->gc_block, aggressive);
 		}
 
-		if (dev->nErasedBlocks < (dev->param.nReservedBlocks) && dev->gcBlock > 0) {
+		if (dev->n_erased_blocks < (dev->param.n_reserved_blocks) && dev->gc_block > 0) {
 			T(YAFFS_TRACE_GC,
 			  (TSTR
 			   ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
-			    TENDSTR), dev->nErasedBlocks, maxTries, dev->gcBlock));
+			    TENDSTR), dev->n_erased_blocks, maxTries, dev->gc_block));
 		}
-	} while ((dev->nErasedBlocks < dev->param.nReservedBlocks) &&
-		 (dev->gcBlock > 0) &&
+	} while ((dev->n_erased_blocks < dev->param.n_reserved_blocks) &&
+		 (dev->gc_block > 0) &&
 		 (maxTries < 2));
 
 	return aggressive ? gcOk : YAFFS_OK;
@@ -2633,66 +2633,66 @@ static int yaffs_check_gc(yaffs_Device *dev, int background)
  * Garbage collects. Intended to be called from a background thread.
  * Returns non-zero if at least half the free chunks are erased.
  */
-int yaffs_bg_gc(yaffs_Device *dev, unsigned urgency)
+int yaffs_bg_gc(yaffs_dev_t *dev, unsigned urgency)
 {
-	int erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock;
+	int erasedChunks = dev->n_erased_blocks * dev->param.chunks_per_block;
 
 	T(YAFFS_TRACE_BACKGROUND, (TSTR("Background gc %u" TENDSTR),urgency));
 
 	yaffs_check_gc(dev, 1);
-	return erasedChunks > dev->nFreeChunks/2;
+	return erasedChunks > dev->n_free_chunks/2;
 }
 
 /*-------------------------  TAGS --------------------------------*/
 
-static int yaffs_tags_match(const yaffs_ExtendedTags *tags, int objectId,
+static int yaffs_tags_match(const yaffs_ext_tags *tags, int obj_id,
 			   int chunkInObject)
 {
-	return (tags->chunkId == chunkInObject &&
-		tags->objectId == objectId && !tags->chunkDeleted) ? 1 : 0;
+	return (tags->chunk_id == chunkInObject &&
+		tags->obj_id == obj_id && !tags->is_deleted) ? 1 : 0;
 
 }
 
 
 /*-------------------- Data file manipulation -----------------*/
 
-static int yaffs_find_chunk_in_file(yaffs_Object *in, int chunkInInode,
-				 yaffs_ExtendedTags *tags)
+static int yaffs_find_chunk_in_file(yaffs_obj_t *in, int inode_chunk,
+				 yaffs_ext_tags *tags)
 {
 	/*Get the Tnode, then get the level 0 offset chunk offset */
 	yaffs_tnode_t *tn;
 	int theChunk = -1;
-	yaffs_ExtendedTags localTags;
+	yaffs_ext_tags localTags;
 	int retVal = -1;
 
-	yaffs_Device *dev = in->myDev;
+	yaffs_dev_t *dev = in->my_dev;
 
 	if (!tags) {
 		/* Passed a NULL, so use our own tags space */
 		tags = &localTags;
 	}
 
-	tn = yaffs_find_tnode_0(dev, &in->variant.fileVariant, chunkInInode);
+	tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
 
 	if (tn) {
-		theChunk = yaffs_get_group_base(dev, tn, chunkInInode);
+		theChunk = yaffs_get_group_base(dev, tn, inode_chunk);
 
 		retVal =
-		    yaffs_find_chunk_in_group(dev, theChunk, tags, in->objectId,
-					   chunkInInode);
+		    yaffs_find_chunk_in_group(dev, theChunk, tags, in->obj_id,
+					   inode_chunk);
 	}
 	return retVal;
 }
 
-static int yaffs_find_del_file_chunk(yaffs_Object *in, int chunkInInode,
-					  yaffs_ExtendedTags *tags)
+static int yaffs_find_del_file_chunk(yaffs_obj_t *in, int inode_chunk,
+					  yaffs_ext_tags *tags)
 {
 	/* Get the Tnode, then get the level 0 offset chunk offset */
 	yaffs_tnode_t *tn;
 	int theChunk = -1;
-	yaffs_ExtendedTags localTags;
+	yaffs_ext_tags localTags;
 
-	yaffs_Device *dev = in->myDev;
+	yaffs_dev_t *dev = in->my_dev;
 	int retVal = -1;
 
 	if (!tags) {
@@ -2700,47 +2700,47 @@ static int yaffs_find_del_file_chunk(yaffs_Object *in, int chunkInInode,
 		tags = &localTags;
 	}
 
-	tn = yaffs_find_tnode_0(dev, &in->variant.fileVariant, chunkInInode);
+	tn = yaffs_find_tnode_0(dev, &in->variant.file_variant, inode_chunk);
 
 	if (tn) {
 
-		theChunk = yaffs_get_group_base(dev, tn, chunkInInode);
+		theChunk = yaffs_get_group_base(dev, tn, inode_chunk);
 
 		retVal =
-		    yaffs_find_chunk_in_group(dev, theChunk, tags, in->objectId,
-					   chunkInInode);
+		    yaffs_find_chunk_in_group(dev, theChunk, tags, in->obj_id,
+					   inode_chunk);
 
 		/* Delete the entry in the filestructure (if found) */
 		if (retVal != -1)
-			yaffs_load_tnode_0(dev, tn, chunkInInode, 0);
+			yaffs_load_tnode_0(dev, tn, inode_chunk, 0);
 	}
 
 	return retVal;
 }
 
 
-int yaffs_put_chunk_in_file(yaffs_Object *in, int chunkInInode,
-			        int chunkInNAND, int inScan)
+int yaffs_put_chunk_in_file(yaffs_obj_t *in, int inode_chunk,
+			        int nand_chunk, int in_scan)
 {
-	/* NB inScan is zero unless scanning.
-	 * For forward scanning, inScan is > 0;
-	 * for backward scanning inScan is < 0
+	/* NB in_scan is zero unless scanning.
+	 * For forward scanning, in_scan is > 0;
+	 * for backward scanning in_scan is < 0
 	 *
-	 * chunkInNAND = 0 is a dummy insert to make sure the tnodes are there.
+	 * nand_chunk = 0 is a dummy insert to make sure the tnodes are there.
 	 */
 
 	yaffs_tnode_t *tn;
-	yaffs_Device *dev = in->myDev;
+	yaffs_dev_t *dev = in->my_dev;
 	int existingChunk;
-	yaffs_ExtendedTags existingTags;
-	yaffs_ExtendedTags newTags;
+	yaffs_ext_tags existingTags;
+	yaffs_ext_tags newTags;
 	unsigned existingSerial, newSerial;
 
-	if (in->variantType != YAFFS_OBJECT_TYPE_FILE) {
+	if (in->variant_type != YAFFS_OBJECT_TYPE_FILE) {
 		/* Just ignore an attempt at putting a chunk into a non-file during scanning
 		 * If it is not during Scanning then something went wrong!
 		 */
-		if (!inScan) {
+		if (!in_scan) {
 			T(YAFFS_TRACE_ERROR,
 			  (TSTR
 			   ("yaffs tragedy:attempt to put data chunk into a non-file"
@@ -2748,24 +2748,24 @@ int yaffs_put_chunk_in_file(yaffs_Object *in, int chunkInInode,
 			YBUG();
 		}
 
-		yaffs_chunk_del(dev, chunkInNAND, 1, __LINE__);
+		yaffs_chunk_del(dev, nand_chunk, 1, __LINE__);
 		return YAFFS_OK;
 	}
 
 	tn = yaffs_add_find_tnode_0(dev,
-					&in->variant.fileVariant,
-					chunkInInode,
+					&in->variant.file_variant,
+					inode_chunk,
 					NULL);
 	if (!tn)
 		return YAFFS_FAIL;
 	
-	if(!chunkInNAND)
+	if(!nand_chunk)
 		/* Dummy insert, bail now */
 		return YAFFS_OK;
 
-	existingChunk = yaffs_get_group_base(dev, tn, chunkInInode);
+	existingChunk = yaffs_get_group_base(dev, tn, inode_chunk);
 
-	if (inScan != 0) {
+	if (in_scan != 0) {
 		/* If we're scanning then we need to test for duplicates
 		 * NB This does not need to be efficient since it should only ever
 		 * happen when the power fails during a write, then only one
@@ -2776,7 +2776,7 @@ int yaffs_put_chunk_in_file(yaffs_Object *in, int chunkInInode,
 		 */
 
 		if (existingChunk > 0) {
-			/* NB Right now existing chunk will not be real chunkId if the chunk group size > 1
+			/* NB Right now existing chunk will not be real chunk_id if the chunk group size > 1
 			 *    thus we have to do a FindChunkInFile to get the real chunk id.
 			 *
 			 * We have a duplicate now we need to decide which one to use:
@@ -2786,15 +2786,15 @@ int yaffs_put_chunk_in_file(yaffs_Object *in, int chunkInInode,
 			 * YAFFS1: Get both sets of tags and compare serial numbers.
 			 */
 
-			if (inScan > 0) {
+			if (in_scan > 0) {
 				/* Only do this for forward scanning */
 				yaffs_rd_chunk_tags_nand(dev,
-								chunkInNAND,
+								nand_chunk,
 								NULL, &newTags);
 
 				/* Do a proper find */
 				existingChunk =
-				    yaffs_find_chunk_in_file(in, chunkInInode,
+				    yaffs_find_chunk_in_file(in, inode_chunk,
 							  &existingTags);
 			}
 
@@ -2812,12 +2812,12 @@ int yaffs_put_chunk_in_file(yaffs_Object *in, int chunkInInode,
 			 * not be loaded during a scan
 			 */
 
-			if (inScan > 0) {
-				newSerial = newTags.serialNumber;
-				existingSerial = existingTags.serialNumber;
+			if (in_scan > 0) {
+				newSerial = newTags.serial_number;
+				existingSerial = existingTags.serial_number;
 			}
 
-			if ((inScan > 0) &&
+			if ((in_scan > 0) &&
 			    (existingChunk <= 0 ||
 			     ((existingSerial + 1) & 3) == newSerial)) {
 				/* Forward scanning.
@@ -2831,7 +2831,7 @@ int yaffs_put_chunk_in_file(yaffs_Object *in, int chunkInInode,
 				 * Use existing.
 				 * Delete the new one and return early so that the tnode isn't changed
 				 */
-				yaffs_chunk_del(dev, chunkInNAND, 1,
+				yaffs_chunk_del(dev, nand_chunk, 1,
 						  __LINE__);
 				return YAFFS_OK;
 			}
@@ -2840,89 +2840,89 @@ int yaffs_put_chunk_in_file(yaffs_Object *in, int chunkInInode,
 	}
 
 	if (existingChunk == 0)
-		in->nDataChunks++;
+		in->n_data_chunks++;
 
-	yaffs_load_tnode_0(dev, tn, chunkInInode, chunkInNAND);
+	yaffs_load_tnode_0(dev, tn, inode_chunk, nand_chunk);
 
 	return YAFFS_OK;
 }
 
-static int yaffs_rd_data_obj(yaffs_Object *in, int chunkInInode,
+static int yaffs_rd_data_obj(yaffs_obj_t *in, int inode_chunk,
 					__u8 *buffer)
 {
-	int chunkInNAND = yaffs_find_chunk_in_file(in, chunkInInode, NULL);
+	int nand_chunk = yaffs_find_chunk_in_file(in, inode_chunk, NULL);
 
-	if (chunkInNAND >= 0)
-		return yaffs_rd_chunk_tags_nand(in->myDev, chunkInNAND,
+	if (nand_chunk >= 0)
+		return yaffs_rd_chunk_tags_nand(in->my_dev, nand_chunk,
 						buffer, NULL);
 	else {
 		T(YAFFS_TRACE_NANDACCESS,
 		  (TSTR("Chunk %d not found zero instead" TENDSTR),
-		   chunkInNAND));
+		   nand_chunk));
 		/* get sane (zero) data if you read a hole */
-		memset(buffer, 0, in->myDev->nDataBytesPerChunk);
+		memset(buffer, 0, in->my_dev->data_bytes_per_chunk);
 		return 0;
 	}
 
 }
 
-void yaffs_chunk_del(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
+void yaffs_chunk_del(yaffs_dev_t *dev, int chunk_id, int mark_flash, int lyn)
 {
 	int block;
 	int page;
-	yaffs_ExtendedTags tags;
-	yaffs_BlockInfo *bi;
+	yaffs_ext_tags tags;
+	yaffs_block_info_t *bi;
 
-	if (chunkId <= 0)
+	if (chunk_id <= 0)
 		return;
 
-	dev->nDeletions++;
-	block = chunkId / dev->param.nChunksPerBlock;
-	page = chunkId % dev->param.nChunksPerBlock;
+	dev->n_deletions++;
+	block = chunk_id / dev->param.chunks_per_block;
+	page = chunk_id % dev->param.chunks_per_block;
 
 
 	if (!yaffs_check_chunk_bit(dev, block, page))
 		T(YAFFS_TRACE_VERIFY,
 			(TSTR("Deleting invalid chunk %d"TENDSTR),
-			 chunkId));
+			 chunk_id));
 
 	bi = yaffs_get_block_info(dev, block);
 	
 	yaffs2_update_oldest_dirty_seq(dev, block, bi);
 
 	T(YAFFS_TRACE_DELETION,
-	  (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunkId));
+	  (TSTR("line %d delete of chunk %d" TENDSTR), lyn, chunk_id));
 
-	if (!dev->param.isYaffs2 && markNAND &&
-	    bi->blockState != YAFFS_BLOCK_STATE_COLLECTING) {
+	if (!dev->param.is_yaffs2 && mark_flash &&
+	    bi->block_state != YAFFS_BLOCK_STATE_COLLECTING) {
 
 		yaffs_init_tags(&tags);
 
-		tags.chunkDeleted = 1;
+		tags.is_deleted = 1;
 
-		yaffs_wr_chunk_tags_nand(dev, chunkId, NULL, &tags);
-		yaffs_handle_chunk_update(dev, chunkId, &tags);
+		yaffs_wr_chunk_tags_nand(dev, chunk_id, NULL, &tags);
+		yaffs_handle_chunk_update(dev, chunk_id, &tags);
 	} else {
-		dev->nUnmarkedDeletions++;
+		dev->n_unmarked_deletions++;
 	}
 
 	/* Pull out of the management area.
 	 * If the whole block became dirty, this will kick off an erasure.
 	 */
-	if (bi->blockState == YAFFS_BLOCK_STATE_ALLOCATING ||
-	    bi->blockState == YAFFS_BLOCK_STATE_FULL ||
-	    bi->blockState == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
-	    bi->blockState == YAFFS_BLOCK_STATE_COLLECTING) {
-		dev->nFreeChunks++;
+	if (bi->block_state == YAFFS_BLOCK_STATE_ALLOCATING ||
+	    bi->block_state == YAFFS_BLOCK_STATE_FULL ||
+	    bi->block_state == YAFFS_BLOCK_STATE_NEEDS_SCANNING ||
+	    bi->block_state == YAFFS_BLOCK_STATE_COLLECTING) {
+		dev->n_free_chunks++;
 
 		yaffs_clear_chunk_bit(dev, block, page);
 
-		bi->pagesInUse--;
+		bi->pages_in_use--;
 
-		if (bi->pagesInUse == 0 &&
-		    !bi->hasShrinkHeader &&
-		    bi->blockState != YAFFS_BLOCK_STATE_ALLOCATING &&
-		    bi->blockState != YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
+		if (bi->pages_in_use == 0 &&
+		    !bi->has_shrink_hdr &&
+		    bi->block_state != YAFFS_BLOCK_STATE_ALLOCATING &&
+		    bi->block_state != YAFFS_BLOCK_STATE_NEEDS_SCANNING) {
 			yaffs_block_became_dirty(dev, block);
 		}
 
@@ -2930,8 +2930,8 @@ void yaffs_chunk_del(yaffs_Device *dev, int chunkId, int markNAND, int lyn)
 
 }
 
-static int yaffs_wr_data_obj(yaffs_Object *in, int chunkInInode,
-					const __u8 *buffer, int nBytes,
+static int yaffs_wr_data_obj(yaffs_obj_t *in, int inode_chunk,
+					const __u8 *buffer, int n_bytes,
 					int useReserve)
 {
 	/* Find old chunk Need to do this to get serial number
@@ -2940,12 +2940,12 @@ static int yaffs_wr_data_obj(yaffs_Object *in, int chunkInInode,
 	 */
 
 	int prevChunkId;
-	yaffs_ExtendedTags prevTags;
+	yaffs_ext_tags prevTags;
 
 	int newChunkId;
-	yaffs_ExtendedTags newTags;
+	yaffs_ext_tags newTags;
 
-	yaffs_Device *dev = in->myDev;
+	yaffs_dev_t *dev = in->my_dev;
 
 	yaffs_check_gc(dev,0);
 
@@ -2953,23 +2953,23 @@ static int yaffs_wr_data_obj(yaffs_Object *in, int chunkInInode,
 	 * If it does not exist then put a zero into the tree. This creates
 	 * the tnode now, rather than later when it is harder to clean up.
 	 */
-	prevChunkId = yaffs_find_chunk_in_file(in, chunkInInode, &prevTags);
+	prevChunkId = yaffs_find_chunk_in_file(in, inode_chunk, &prevTags);
 	if(prevChunkId < 1 &&
-		!yaffs_put_chunk_in_file(in, chunkInInode, 0, 0))
+		!yaffs_put_chunk_in_file(in, inode_chunk, 0, 0))
 		return 0;
 
 	/* Set up new tags */
 	yaffs_init_tags(&newTags);
 
-	newTags.chunkId = chunkInInode;
-	newTags.objectId = in->objectId;
-	newTags.serialNumber =
-	    (prevChunkId > 0) ? prevTags.serialNumber + 1 : 1;
-	newTags.byteCount = nBytes;
+	newTags.chunk_id = inode_chunk;
+	newTags.obj_id = in->obj_id;
+	newTags.serial_number =
+	    (prevChunkId > 0) ? prevTags.serial_number + 1 : 1;
+	newTags.n_bytes = n_bytes;
 
-	if (nBytes < 1 || nBytes > dev->param.totalBytesPerChunk) {
+	if (n_bytes < 1 || n_bytes > dev->param.total_bytes_per_chunk) {
 		T(YAFFS_TRACE_ERROR,
-		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), nBytes));
+		(TSTR("Writing %d bytes to chunk!!!!!!!!!" TENDSTR), n_bytes));
 		YBUG();
 	}
 	
@@ -2979,7 +2979,7 @@ static int yaffs_wr_data_obj(yaffs_Object *in, int chunkInInode,
 					      useReserve);
 
 	if (newChunkId > 0) {
-		yaffs_put_chunk_in_file(in, chunkInInode, newChunkId, 0);
+		yaffs_put_chunk_in_file(in, inode_chunk, newChunkId, 0);
 
 		if (prevChunkId > 0)
 			yaffs_chunk_del(dev, prevChunkId, 1, __LINE__);
@@ -2993,42 +2993,42 @@ static int yaffs_wr_data_obj(yaffs_Object *in, int chunkInInode,
 /* UpdateObjectHeader updates the header on NAND for an object.
  * If name is not NULL, then that new name is used.
  */
-int yaffs_update_oh(yaffs_Object *in, const YCHAR *name, int force,
-			     int isShrink, int shadows, yaffs_xattr_mod *xmod)
+int yaffs_update_oh(yaffs_obj_t *in, const YCHAR *name, int force,
+			     int is_shrink, int shadows, yaffs_xattr_mod *xmod)
 {
 
-	yaffs_BlockInfo *bi;
+	yaffs_block_info_t *bi;
 
-	yaffs_Device *dev = in->myDev;
+	yaffs_dev_t *dev = in->my_dev;
 
 	int prevChunkId;
 	int retVal = 0;
 	int result = 0;
 
 	int newChunkId;
-	yaffs_ExtendedTags newTags;
-	yaffs_ExtendedTags oldTags;
+	yaffs_ext_tags newTags;
+	yaffs_ext_tags oldTags;
 	const YCHAR *alias = NULL;
 
 	__u8 *buffer = NULL;
-	YCHAR oldName[YAFFS_MAX_NAME_LENGTH + 1];
+	YCHAR old_name[YAFFS_MAX_NAME_LENGTH + 1];
 
-	yaffs_ObjectHeader *oh = NULL;
+	yaffs_obj_header *oh = NULL;
 
-	yaffs_strcpy(oldName, _Y("silly old name"));
+	yaffs_strcpy(old_name, _Y("silly old name"));
 
 
 	if (!in->fake ||
-		in == dev->rootDir || /* The rootDir should also be saved */
+		in == dev->root_dir || /* The root_dir should also be saved */
 		force  || xmod) {
 
 		yaffs_check_gc(dev,0);
 		yaffs_check_obj_details_loaded(in);
 
-		buffer = yaffs_get_temp_buffer(in->myDev, __LINE__);
-		oh = (yaffs_ObjectHeader *) buffer;
+		buffer = yaffs_get_temp_buffer(in->my_dev, __LINE__);
+		oh = (yaffs_obj_header *) buffer;
 
-		prevChunkId = in->hdrChunk;
+		prevChunkId = in->hdr_chunk;
 
 		if (prevChunkId > 0) {
 			result = yaffs_rd_chunk_tags_nand(dev, prevChunkId,
@@ -3036,14 +3036,14 @@ int yaffs_update_oh(yaffs_Object *in, const YCHAR *name, int force,
 
 			yaffs_verify_oh(in, oh, &oldTags, 0);
 
-			memcpy(oldName, oh->name, sizeof(oh->name));
-			memset(buffer, 0xFF, sizeof(yaffs_ObjectHeader));
+			memcpy(old_name, oh->name, sizeof(oh->name));
+			memset(buffer, 0xFF, sizeof(yaffs_obj_header));
 		} else
-			memset(buffer, 0xFF, dev->nDataBytesPerChunk);
+			memset(buffer, 0xFF, dev->data_bytes_per_chunk);
 
-		oh->type = in->variantType;
+		oh->type = in->variant_type;
 		oh->yst_mode = in->yst_mode;
-		oh->shadowsObject = oh->inbandShadowsObject = shadows;
+		oh->shadows_obj = oh->inband_shadowed_obj_id = shadows;
 
 #ifdef CONFIG_YAFFS_WINCE
 		oh->win_atime[0] = in->win_atime[0];
@@ -3061,34 +3061,34 @@ int yaffs_update_oh(yaffs_Object *in, const YCHAR *name, int force,
 		oh->yst_rdev = in->yst_rdev;
 #endif
 		if (in->parent)
-			oh->parentObjectId = in->parent->objectId;
+			oh->parent_obj_id = in->parent->obj_id;
 		else
-			oh->parentObjectId = 0;
+			oh->parent_obj_id = 0;
 
 		if (name && *name) {
 			memset(oh->name, 0, sizeof(oh->name));
 			yaffs_load_oh_from_name(dev,oh->name,name);
 		} else if (prevChunkId > 0)
-			memcpy(oh->name, oldName, sizeof(oh->name));
+			memcpy(oh->name, old_name, sizeof(oh->name));
 		else
 			memset(oh->name, 0, sizeof(oh->name));
 
-		oh->isShrink = isShrink;
+		oh->is_shrink = is_shrink;
 
-		switch (in->variantType) {
+		switch (in->variant_type) {
 		case YAFFS_OBJECT_TYPE_UNKNOWN:
 			/* Should not happen */
 			break;
 		case YAFFS_OBJECT_TYPE_FILE:
-			oh->fileSize =
-			    (oh->parentObjectId == YAFFS_OBJECTID_DELETED
-			     || oh->parentObjectId ==
+			oh->file_size =
+			    (oh->parent_obj_id == YAFFS_OBJECTID_DELETED
+			     || oh->parent_obj_id ==
 			     YAFFS_OBJECTID_UNLINKED) ? 0 : in->variant.
-			    fileVariant.fileSize;
+			    file_variant.file_size;
 			break;
 		case YAFFS_OBJECT_TYPE_HARDLINK:
-			oh->equivalentObjectId =
-			    in->variant.hardLinkVariant.equivalentObjectId;
+			oh->equiv_id =
+			    in->variant.hardlink_variant.equiv_id;
 			break;
 		case YAFFS_OBJECT_TYPE_SPECIAL:
 			/* Do nothing */
@@ -3097,7 +3097,7 @@ int yaffs_update_oh(yaffs_Object *in, const YCHAR *name, int force,
 			/* Do nothing */
 			break;
 		case YAFFS_OBJECT_TYPE_SYMLINK:
-			alias = in->variant.symLinkVariant.alias;
+			alias = in->variant.symlink_variant.alias;
 			if(!alias)
 				alias = _Y("no alias");
 			yaffs_strncpy(oh->alias,
@@ -3115,19 +3115,19 @@ int yaffs_update_oh(yaffs_Object *in, const YCHAR *name, int force,
 		/* Tags */
 		yaffs_init_tags(&newTags);
 		in->serial++;
-		newTags.chunkId = 0;
-		newTags.objectId = in->objectId;
-		newTags.serialNumber = in->serial;
+		newTags.chunk_id = 0;
+		newTags.obj_id = in->obj_id;
+		newTags.serial_number = in->serial;
 
 		/* Add extra info for file header */
 
-		newTags.extraHeaderInfoAvailable = 1;
-		newTags.extraParentObjectId = oh->parentObjectId;
-		newTags.extraFileLength = oh->fileSize;
-		newTags.extraIsShrinkHeader = oh->isShrink;
-		newTags.extraEquivalentObjectId = oh->equivalentObjectId;
-		newTags.extraShadows = (oh->shadowsObject > 0) ? 1 : 0;
-		newTags.extraObjectType = in->variantType;
+		newTags.extra_available = 1;
+		newTags.extra_parent_id = oh->parent_obj_id;
+		newTags.extra_length = oh->file_size;
+		newTags.extra_is_shrink = oh->is_shrink;
+		newTags.extra_equiv_id = oh->equiv_id;
+		newTags.extra_shadows = (oh->shadows_obj > 0) ? 1 : 0;
+		newTags.extra_obj_type = in->variant_type;
 
 		yaffs_verify_oh(in, oh, &newTags, 1);
 
@@ -3138,7 +3138,7 @@ int yaffs_update_oh(yaffs_Object *in, const YCHAR *name, int force,
 
 		if (newChunkId >= 0) {
 
-			in->hdrChunk = newChunkId;
+			in->hdr_chunk = newChunkId;
 
 			if (prevChunkId > 0) {
 				yaffs_chunk_del(dev, prevChunkId, 1,
@@ -3149,10 +3149,10 @@ int yaffs_update_oh(yaffs_Object *in, const YCHAR *name, int force,
 				in->dirty = 0;
 
 			/* If this was a shrink, then mark the block that the chunk lives on */
-			if (isShrink) {
-				bi = yaffs_get_block_info(in->myDev,
-					newChunkId / in->myDev->param.nChunksPerBlock);
-				bi->hasShrinkHeader = 1;
+			if (is_shrink) {
+				bi = yaffs_get_block_info(in->my_dev,
+					newChunkId / in->my_dev->param.chunks_per_block);
+				bi->has_shrink_hdr = 1;
 			}
 
 		}
@@ -3180,15 +3180,15 @@ int yaffs_update_oh(yaffs_Object *in, const YCHAR *name, int force,
  *   need a very intelligent search.
  */
 
-static int yaffs_obj_cache_dirty(yaffs_Object *obj)
+static int yaffs_obj_cache_dirty(yaffs_obj_t *obj)
 {
-	yaffs_Device *dev = obj->myDev;
+	yaffs_dev_t *dev = obj->my_dev;
 	int i;
-	yaffs_ChunkCache *cache;
-	int nCaches = obj->myDev->param.nShortOpCaches;
+	yaffs_cache_t *cache;
+	int nCaches = obj->my_dev->param.n_caches;
 
 	for (i = 0; i < nCaches; i++) {
-		cache = &dev->srCache[i];
+		cache = &dev->cache[i];
 		if (cache->object == obj &&
 		    cache->dirty)
 			return 1;
@@ -3198,14 +3198,14 @@ static int yaffs_obj_cache_dirty(yaffs_Object *obj)
 }
 
 
-static void yaffs_flush_file_cache(yaffs_Object *obj)
+static void yaffs_flush_file_cache(yaffs_obj_t *obj)
 {
-	yaffs_Device *dev = obj->myDev;
+	yaffs_dev_t *dev = obj->my_dev;
 	int lowest = -99;	/* Stop compiler whining. */
 	int i;
-	yaffs_ChunkCache *cache;
+	yaffs_cache_t *cache;
 	int chunkWritten = 0;
-	int nCaches = obj->myDev->param.nShortOpCaches;
+	int nCaches = obj->my_dev->param.n_caches;
 
 	if (nCaches > 0) {
 		do {
@@ -3213,13 +3213,13 @@ static void yaffs_flush_file_cache(yaffs_Object *obj)
 
 			/* Find the dirty cache for this object with the lowest chunk id. */
 			for (i = 0; i < nCaches; i++) {
-				if (dev->srCache[i].object == obj &&
-				    dev->srCache[i].dirty) {
+				if (dev->cache[i].object == obj &&
+				    dev->cache[i].dirty) {
 					if (!cache
-					    || dev->srCache[i].chunkId <
+					    || dev->cache[i].chunk_id <
 					    lowest) {
-						cache = &dev->srCache[i];
-						lowest = cache->chunkId;
+						cache = &dev->cache[i];
+						lowest = cache->chunk_id;
 					}
 				}
 			}
@@ -3229,9 +3229,9 @@ static void yaffs_flush_file_cache(yaffs_Object *obj)
 
 				chunkWritten =
 				    yaffs_wr_data_obj(cache->object,
-								 cache->chunkId,
+								 cache->chunk_id,
 								 cache->data,
-								 cache->nBytes,
+								 cache->n_bytes,
 								 1);
 				cache->dirty = 0;
 				cache->object = NULL;
@@ -3254,10 +3254,10 @@ static void yaffs_flush_file_cache(yaffs_Object *obj)
  *
  */
 
-void yaffs_flush_whole_cache(yaffs_Device *dev)
+void yaffs_flush_whole_cache(yaffs_dev_t *dev)
 {
-	yaffs_Object *obj;
-	int nCaches = dev->param.nShortOpCaches;
+	yaffs_obj_t *obj;
+	int nCaches = dev->param.n_caches;
 	int i;
 
 	/* Find a dirty object in the cache and flush it...
@@ -3266,9 +3266,9 @@ void yaffs_flush_whole_cache(yaffs_Device *dev)
 	do {
 		obj = NULL;
 		for (i = 0; i < nCaches && !obj; i++) {
-			if (dev->srCache[i].object &&
-			    dev->srCache[i].dirty)
-				obj = dev->srCache[i].object;
+			if (dev->cache[i].object &&
+			    dev->cache[i].dirty)
+				obj = dev->cache[i].object;
 
 		}
 		if (obj)
@@ -3284,29 +3284,29 @@ void yaffs_flush_whole_cache(yaffs_Device *dev)
  * Then look for the least recently used non-dirty one.
  * Then look for the least recently used dirty one...., flush and look again.
  */
-static yaffs_ChunkCache *yaffs_grab_chunk_worker(yaffs_Device *dev)
+static yaffs_cache_t *yaffs_grab_chunk_worker(yaffs_dev_t *dev)
 {
 	int i;
 
-	if (dev->param.nShortOpCaches > 0) {
-		for (i = 0; i < dev->param.nShortOpCaches; i++) {
-			if (!dev->srCache[i].object)
-				return &dev->srCache[i];
+	if (dev->param.n_caches > 0) {
+		for (i = 0; i < dev->param.n_caches; i++) {
+			if (!dev->cache[i].object)
+				return &dev->cache[i];
 		}
 	}
 
 	return NULL;
 }
 
-static yaffs_ChunkCache *yaffs_grab_chunk_cache(yaffs_Device *dev)
+static yaffs_cache_t *yaffs_grab_chunk_cache(yaffs_dev_t *dev)
 {
-	yaffs_ChunkCache *cache;
-	yaffs_Object *theObj;
+	yaffs_cache_t *cache;
+	yaffs_obj_t *theObj;
 	int usage;
 	int i;
 	int pushout;
 
-	if (dev->param.nShortOpCaches > 0) {
+	if (dev->param.n_caches > 0) {
 		/* Try find a non-dirty one... */
 
 		cache = yaffs_grab_chunk_worker(dev);
@@ -3325,13 +3325,13 @@ static yaffs_ChunkCache *yaffs_grab_chunk_cache(yaffs_Device *dev)
 			cache = NULL;
 			pushout = -1;
 
-			for (i = 0; i < dev->param.nShortOpCaches; i++) {
-				if (dev->srCache[i].object &&
-				    !dev->srCache[i].locked &&
-				    (dev->srCache[i].lastUse < usage || !cache)) {
-					usage = dev->srCache[i].lastUse;
-					theObj = dev->srCache[i].object;
-					cache = &dev->srCache[i];
+			for (i = 0; i < dev->param.n_caches; i++) {
+				if (dev->cache[i].object &&
+				    !dev->cache[i].locked &&
+				    (dev->cache[i].last_use < usage || !cache)) {
+					usage = dev->cache[i].last_use;
+					theObj = dev->cache[i].object;
+					cache = &dev->cache[i];
 					pushout = i;
 				}
 			}
@@ -3350,18 +3350,18 @@ static yaffs_ChunkCache *yaffs_grab_chunk_cache(yaffs_Device *dev)
 }
 
 /* Find a cached chunk */
-static yaffs_ChunkCache *yaffs_find_chunk_cache(const yaffs_Object *obj,
-					      int chunkId)
+static yaffs_cache_t *yaffs_find_chunk_cache(const yaffs_obj_t *obj,
+					      int chunk_id)
 {
-	yaffs_Device *dev = obj->myDev;
+	yaffs_dev_t *dev = obj->my_dev;
 	int i;
-	if (dev->param.nShortOpCaches > 0) {
-		for (i = 0; i < dev->param.nShortOpCaches; i++) {
-			if (dev->srCache[i].object == obj &&
-			    dev->srCache[i].chunkId == chunkId) {
-				dev->cacheHits++;
+	if (dev->param.n_caches > 0) {
+		for (i = 0; i < dev->param.n_caches; i++) {
+			if (dev->cache[i].object == obj &&
+			    dev->cache[i].chunk_id == chunk_id) {
+				dev->cache_hits++;
 
-				return &dev->srCache[i];
+				return &dev->cache[i];
 			}
 		}
 	}
@@ -3369,23 +3369,23 @@ static yaffs_ChunkCache *yaffs_find_chunk_cache(const yaffs_Object *obj,
 }
 
 /* Mark the chunk for the least recently used algorithym */
-static void yaffs_use_cache(yaffs_Device *dev, yaffs_ChunkCache *cache,
+static void yaffs_use_cache(yaffs_dev_t *dev, yaffs_cache_t *cache,
 				int isAWrite)
 {
 
-	if (dev->param.nShortOpCaches > 0) {
-		if (dev->srLastUse < 0 || dev->srLastUse > 100000000) {
+	if (dev->param.n_caches > 0) {
+		if (dev->cache_last_use < 0 || dev->cache_last_use > 100000000) {
 			/* Reset the cache usages */
 			int i;
-			for (i = 1; i < dev->param.nShortOpCaches; i++)
-				dev->srCache[i].lastUse = 0;
+			for (i = 1; i < dev->param.n_caches; i++)
+				dev->cache[i].last_use = 0;
 
-			dev->srLastUse = 0;
+			dev->cache_last_use = 0;
 		}
 
-		dev->srLastUse++;
+		dev->cache_last_use++;
 
-		cache->lastUse = dev->srLastUse;
+		cache->last_use = dev->cache_last_use;
 
 		if (isAWrite)
 			cache->dirty = 1;
@@ -3396,10 +3396,10 @@ static void yaffs_use_cache(yaffs_Device *dev, yaffs_ChunkCache *cache,
  * Do this when a whole page gets written,
  * ie the short cache for this page is no longer valid.
  */
-static void yaffs_invalidate_chunk_cache(yaffs_Object *object, int chunkId)
+static void yaffs_invalidate_chunk_cache(yaffs_obj_t *object, int chunk_id)
 {
-	if (object->myDev->param.nShortOpCaches > 0) {
-		yaffs_ChunkCache *cache = yaffs_find_chunk_cache(object, chunkId);
+	if (object->my_dev->param.n_caches > 0) {
+		yaffs_cache_t *cache = yaffs_find_chunk_cache(object, chunk_id);
 
 		if (cache)
 			cache->object = NULL;
@@ -3409,16 +3409,16 @@ static void yaffs_invalidate_chunk_cache(yaffs_Object *object, int chunkId)
 /* Invalidate all the cache pages associated with this object
  * Do this whenever ther file is deleted or resized.
  */
-static void yaffs_invalidate_whole_cache(yaffs_Object *in)
+static void yaffs_invalidate_whole_cache(yaffs_obj_t *in)
 {
 	int i;
-	yaffs_Device *dev = in->myDev;
+	yaffs_dev_t *dev = in->my_dev;
 
-	if (dev->param.nShortOpCaches > 0) {
+	if (dev->param.n_caches > 0) {
 		/* Invalidate it. */
-		for (i = 0; i < dev->param.nShortOpCaches; i++) {
-			if (dev->srCache[i].object == in)
-				dev->srCache[i].object = NULL;
+		for (i = 0; i < dev->param.n_caches; i++) {
+			if (dev->cache[i].object == in)
+				dev->cache[i].object = NULL;
 		}
 	}
 }
@@ -3434,34 +3434,34 @@ static void yaffs_invalidate_whole_cache(yaffs_Object *in)
  * Curve-balls: the first chunk might also be the last chunk.
  */
 
-int yaffs_file_rd(yaffs_Object *in, __u8 *buffer, loff_t offset,
-			int nBytes)
+int yaffs_file_rd(yaffs_obj_t *in, __u8 *buffer, loff_t offset,
+			int n_bytes)
 {
 
 	int chunk;
 	__u32 start;
 	int nToCopy;
-	int n = nBytes;
+	int n = n_bytes;
 	int nDone = 0;
-	yaffs_ChunkCache *cache;
+	yaffs_cache_t *cache;
 
-	yaffs_Device *dev;
+	yaffs_dev_t *dev;
 
-	dev = in->myDev;
+	dev = in->my_dev;
 
 	while (n > 0) {
-		/* chunk = offset / dev->nDataBytesPerChunk + 1; */
-		/* start = offset % dev->nDataBytesPerChunk; */
+		/* chunk = offset / dev->data_bytes_per_chunk + 1; */
+		/* start = offset % dev->data_bytes_per_chunk; */
 		yaffs_addr_to_chunk(dev, offset, &chunk, &start);
 		chunk++;
 
 		/* OK now check for the curveball where the start and end are in
 		 * the same chunk.
 		 */
-		if ((start + n) < dev->nDataBytesPerChunk)
+		if ((start + n) < dev->data_bytes_per_chunk)
 			nToCopy = n;
 		else
-			nToCopy = dev->nDataBytesPerChunk - start;
+			nToCopy = dev->data_bytes_per_chunk - start;
 
 		cache = yaffs_find_chunk_cache(in, chunk);
 
@@ -3469,21 +3469,21 @@ int yaffs_file_rd(yaffs_Object *in, __u8 *buffer, loff_t offset,
 		 * or we're using inband tags then use the cache (if there is caching)
 		 * else bypass the cache.
 		 */
-		if (cache || nToCopy != dev->nDataBytesPerChunk || dev->param.inbandTags) {
-			if (dev->param.nShortOpCaches > 0) {
+		if (cache || nToCopy != dev->data_bytes_per_chunk || dev->param.inband_tags) {
+			if (dev->param.n_caches > 0) {
 
 				/* If we can't find the data in the cache, then load it up. */
 
 				if (!cache) {
-					cache = yaffs_grab_chunk_cache(in->myDev);
+					cache = yaffs_grab_chunk_cache(in->my_dev);
 					cache->object = in;
-					cache->chunkId = chunk;
+					cache->chunk_id = chunk;
 					cache->dirty = 0;
 					cache->locked = 0;
 					yaffs_rd_data_obj(in, chunk,
 								      cache->
 								      data);
-					cache->nBytes = 0;
+					cache->n_bytes = 0;
 				}
 
 				yaffs_use_cache(dev, cache, 0);
@@ -3526,30 +3526,30 @@ int yaffs_file_rd(yaffs_Object *in, __u8 *buffer, loff_t offset,
 	return nDone;
 }
 
-int yaffs_do_file_wr(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-			int nBytes, int writeThrough)
+int yaffs_do_file_wr(yaffs_obj_t *in, const __u8 *buffer, loff_t offset,
+			int n_bytes, int write_trhrough)
 {
 
 	int chunk;
 	__u32 start;
 	int nToCopy;
-	int n = nBytes;
+	int n = n_bytes;
 	int nDone = 0;
 	int nToWriteBack;
 	int startOfWrite = offset;
 	int chunkWritten = 0;
-	__u32 nBytesRead;
+	__u32 n_bytesRead;
 	__u32 chunkStart;
 
-	yaffs_Device *dev;
+	yaffs_dev_t *dev;
 
-	dev = in->myDev;
+	dev = in->my_dev;
 
 	while (n > 0 && chunkWritten >= 0) {
 		yaffs_addr_to_chunk(dev, offset, &chunk, &start);
 
-		if (chunk * dev->nDataBytesPerChunk + start != offset ||
-				start >= dev->nDataBytesPerChunk) {
+		if (chunk * dev->data_bytes_per_chunk + start != offset ||
+				start >= dev->data_bytes_per_chunk) {
 			T(YAFFS_TRACE_ERROR, (
 			   TSTR("AddrToChunk of offset %d gives chunk %d start %d"
 			   TENDSTR),
@@ -3561,7 +3561,7 @@ int yaffs_do_file_wr(yaffs_Object *in, const __u8 *buffer, loff_t offset,
 		 * the same chunk.
 		 */
 
-		if ((start + n) < dev->nDataBytesPerChunk) {
+		if ((start + n) < dev->data_bytes_per_chunk) {
 			nToCopy = n;
 
 			/* Now folks, to calculate how many bytes to write back....
@@ -3569,34 +3569,34 @@ int yaffs_do_file_wr(yaffs_Object *in, const __u8 *buffer, loff_t offset,
 			 * we need to write back as much as was there before.
 			 */
 
-			chunkStart = ((chunk - 1) * dev->nDataBytesPerChunk);
+			chunkStart = ((chunk - 1) * dev->data_bytes_per_chunk);
 
-			if (chunkStart > in->variant.fileVariant.fileSize)
-				nBytesRead = 0; /* Past end of file */
+			if (chunkStart > in->variant.file_variant.file_size)
+				n_bytesRead = 0; /* Past end of file */
 			else
-				nBytesRead = in->variant.fileVariant.fileSize - chunkStart;
+				n_bytesRead = in->variant.file_variant.file_size - chunkStart;
 
-			if (nBytesRead > dev->nDataBytesPerChunk)
-				nBytesRead = dev->nDataBytesPerChunk;
+			if (n_bytesRead > dev->data_bytes_per_chunk)
+				n_bytesRead = dev->data_bytes_per_chunk;
 
 			nToWriteBack =
-			    (nBytesRead >
-			     (start + n)) ? nBytesRead : (start + n);
+			    (n_bytesRead >
+			     (start + n)) ? n_bytesRead : (start + n);
 
-			if (nToWriteBack < 0 || nToWriteBack > dev->nDataBytesPerChunk)
+			if (nToWriteBack < 0 || nToWriteBack > dev->data_bytes_per_chunk)
 				YBUG();
 
 		} else {
-			nToCopy = dev->nDataBytesPerChunk - start;
-			nToWriteBack = dev->nDataBytesPerChunk;
+			nToCopy = dev->data_bytes_per_chunk - start;
+			nToWriteBack = dev->data_bytes_per_chunk;
 		}
 
-		if (nToCopy != dev->nDataBytesPerChunk || dev->param.inbandTags) {
+		if (nToCopy != dev->data_bytes_per_chunk || dev->param.inband_tags) {
 			/* An incomplete start or end chunk (or maybe both start and end chunk),
 			 * or we're using inband tags, so we want to use the cache buffers.
 			 */
-			if (dev->param.nShortOpCaches > 0) {
-				yaffs_ChunkCache *cache;
+			if (dev->param.n_caches > 0) {
+				yaffs_cache_t *cache;
 				/* If we can't find the data in the cache, then load the cache */
 				cache = yaffs_find_chunk_cache(in, chunk);
 
@@ -3604,7 +3604,7 @@ int yaffs_do_file_wr(yaffs_Object *in, const __u8 *buffer, loff_t offset,
 				    && yaffs_check_alloc_available(dev, 1)) {
 					cache = yaffs_grab_chunk_cache(dev);
 					cache->object = in;
-					cache->chunkId = chunk;
+					cache->chunk_id = chunk;
 					cache->dirty = 0;
 					cache->locked = 0;
 					yaffs_rd_data_obj(in, chunk,
@@ -3628,14 +3628,14 @@ int yaffs_do_file_wr(yaffs_Object *in, const __u8 *buffer, loff_t offset,
 
 
 					cache->locked = 0;
-					cache->nBytes = nToWriteBack;
+					cache->n_bytes = nToWriteBack;
 
-					if (writeThrough) {
+					if (write_trhrough) {
 						chunkWritten =
 						    yaffs_wr_data_obj
 						    (cache->object,
-						     cache->chunkId,
-						     cache->data, cache->nBytes,
+						     cache->chunk_id,
+						     cache->data, cache->n_bytes,
 						     1);
 						cache->dirty = 0;
 					}
@@ -3676,7 +3676,7 @@ int yaffs_do_file_wr(yaffs_Object *in, const __u8 *buffer, loff_t offset,
 
 			chunkWritten =
 			    yaffs_wr_data_obj(in, chunk, buffer,
-							 dev->nDataBytesPerChunk,
+							 dev->data_bytes_per_chunk,
 							 0);
 
 			/* Since we've overwritten the cached data, we better invalidate it. */
@@ -3694,37 +3694,37 @@ int yaffs_do_file_wr(yaffs_Object *in, const __u8 *buffer, loff_t offset,
 
 	/* Update file object */
 
-	if ((startOfWrite + nDone) > in->variant.fileVariant.fileSize)
-		in->variant.fileVariant.fileSize = (startOfWrite + nDone);
+	if ((startOfWrite + nDone) > in->variant.file_variant.file_size)
+		in->variant.file_variant.file_size = (startOfWrite + nDone);
 
 	in->dirty = 1;
 
 	return nDone;
 }
 
-int yaffs_wr_file(yaffs_Object *in, const __u8 *buffer, loff_t offset,
-			int nBytes, int writeThrough)
+int yaffs_wr_file(yaffs_obj_t *in, const __u8 *buffer, loff_t offset,
+			int n_bytes, int write_trhrough)
 {
 	yaffs2_handle_hole(in,offset);
-	return yaffs_do_file_wr(in,buffer,offset,nBytes,writeThrough);
+	return yaffs_do_file_wr(in,buffer,offset,n_bytes,write_trhrough);
 }
 
 
 
 /* ---------------------- File resizing stuff ------------------ */
 
-static void yaffs_prune_chunks(yaffs_Object *in, int newSize)
+static void yaffs_prune_chunks(yaffs_obj_t *in, int new_size)
 {
 
-	yaffs_Device *dev = in->myDev;
-	int oldFileSize = in->variant.fileVariant.fileSize;
+	yaffs_dev_t *dev = in->my_dev;
+	int oldFileSize = in->variant.file_variant.file_size;
 
-	int lastDel = 1 + (oldFileSize - 1) / dev->nDataBytesPerChunk;
+	int lastDel = 1 + (oldFileSize - 1) / dev->data_bytes_per_chunk;
 
-	int startDel = 1 + (newSize + dev->nDataBytesPerChunk - 1) /
-	    dev->nDataBytesPerChunk;
+	int startDel = 1 + (new_size + dev->data_bytes_per_chunk - 1) /
+	    dev->data_bytes_per_chunk;
 	int i;
-	int chunkId;
+	int chunk_id;
 
 	/* Delete backwards so that we don't end up with holes if
 	 * power is lost part-way through the operation.
@@ -3735,19 +3735,19 @@ static void yaffs_prune_chunks(yaffs_Object *in, int newSize)
 		 * using yaffs_chunk_del
 		 */
 
-		chunkId = yaffs_find_del_file_chunk(in, i, NULL);
-		if (chunkId > 0) {
-			if (chunkId <
-			    (dev->internalStartBlock * dev->param.nChunksPerBlock)
-			    || chunkId >=
-			    ((dev->internalEndBlock +
-			      1) * dev->param.nChunksPerBlock)) {
+		chunk_id = yaffs_find_del_file_chunk(in, i, NULL);
+		if (chunk_id > 0) {
+			if (chunk_id <
+			    (dev->internal_start_block * dev->param.chunks_per_block)
+			    || chunk_id >=
+			    ((dev->internal_end_block +
+			      1) * dev->param.chunks_per_block)) {
 				T(YAFFS_TRACE_ALWAYS,
-				  (TSTR("Found daft chunkId %d for %d" TENDSTR),
-				   chunkId, i));
+				  (TSTR("Found daft chunk_id %d for %d" TENDSTR),
+				   chunk_id, i));
 			} else {
-				in->nDataChunks--;
-				yaffs_chunk_del(dev, chunkId, 1, __LINE__);
+				in->n_data_chunks--;
+				yaffs_chunk_del(dev, chunk_id, 1, __LINE__);
 			}
 		}
 	}
@@ -3755,59 +3755,59 @@ static void yaffs_prune_chunks(yaffs_Object *in, int newSize)
 }
 
 
-void yaffs_resize_file_down( yaffs_Object *obj, loff_t newSize)
+void yaffs_resize_file_down( yaffs_obj_t *obj, loff_t new_size)
 {
 	int newFullChunks;
-	__u32 newSizeOfPartialChunk;
-	yaffs_Device *dev = obj->myDev;
+	__u32 new_sizeOfPartialChunk;
+	yaffs_dev_t *dev = obj->my_dev;
 
-	yaffs_addr_to_chunk(dev, newSize, &newFullChunks, &newSizeOfPartialChunk);
+	yaffs_addr_to_chunk(dev, new_size, &newFullChunks, &new_sizeOfPartialChunk);
 
-	yaffs_prune_chunks(obj, newSize);
+	yaffs_prune_chunks(obj, new_size);
 
-	if (newSizeOfPartialChunk != 0) {
+	if (new_sizeOfPartialChunk != 0) {
 		int lastChunk = 1 + newFullChunks;
 		__u8 *localBuffer = yaffs_get_temp_buffer(dev, __LINE__);
 
 		/* Got to read and rewrite the last chunk with its new size and zero pad */
 		yaffs_rd_data_obj(obj, lastChunk, localBuffer);
-		memset(localBuffer + newSizeOfPartialChunk, 0,
-			dev->nDataBytesPerChunk - newSizeOfPartialChunk);
+		memset(localBuffer + new_sizeOfPartialChunk, 0,
+			dev->data_bytes_per_chunk - new_sizeOfPartialChunk);
 
 		yaffs_wr_data_obj(obj, lastChunk, localBuffer,
-					     newSizeOfPartialChunk, 1);
+					     new_sizeOfPartialChunk, 1);
 
 		yaffs_release_temp_buffer(dev, localBuffer, __LINE__);
 	}
 
-	obj->variant.fileVariant.fileSize = newSize;
+	obj->variant.file_variant.file_size = new_size;
 
-	yaffs_prune_tree(dev, &obj->variant.fileVariant);
+	yaffs_prune_tree(dev, &obj->variant.file_variant);
 }
 
 
-int yaffs_resize_file(yaffs_Object *in, loff_t newSize)
+int yaffs_resize_file(yaffs_obj_t *in, loff_t new_size)
 {
-	yaffs_Device *dev = in->myDev;
-	int oldFileSize = in->variant.fileVariant.fileSize;
+	yaffs_dev_t *dev = in->my_dev;
+	int oldFileSize = in->variant.file_variant.file_size;
 
 	yaffs_flush_file_cache(in);
 	yaffs_invalidate_whole_cache(in);
 
 	yaffs_check_gc(dev,0);
 
-	if (in->variantType != YAFFS_OBJECT_TYPE_FILE)
+	if (in->variant_type != YAFFS_OBJECT_TYPE_FILE)
 		return YAFFS_FAIL;
 
-	if (newSize == oldFileSize)
+	if (new_size == oldFileSize)
 		return YAFFS_OK;
 		
-	if(newSize > oldFileSize){
-		yaffs2_handle_hole(in,newSize);
-		in->variant.fileVariant.fileSize = newSize;
+	if(new_size > oldFileSize){
+		yaffs2_handle_hole(in,new_size);
+		in->variant.file_variant.file_size = new_size;
 	} else {
-		/* newSize < oldFileSize */ 
-		yaffs_resize_file_down(in, newSize);
+		/* new_size < oldFileSize */ 
+		yaffs_resize_file_down(in, new_size);
 	} 
 
 	/* Write a new object header to reflect the resize.
@@ -3816,25 +3816,25 @@ int yaffs_resize_file(yaffs_Object *in, loff_t newSize)
 	 * and is not shadowed.
 	 */
 	if (in->parent &&
-	    !in->isShadowed &&
-	    in->parent->objectId != YAFFS_OBJECTID_UNLINKED &&
-	    in->parent->objectId != YAFFS_OBJECTID_DELETED)
+	    !in->is_shadowed &&
+	    in->parent->obj_id != YAFFS_OBJECTID_UNLINKED &&
+	    in->parent->obj_id != YAFFS_OBJECTID_DELETED)
 		yaffs_update_oh(in, NULL, 0, 0, 0, NULL);
 
 
 	return YAFFS_OK;
 }
 
-loff_t yaffs_get_file_size(yaffs_Object *obj)
+loff_t yaffs_get_file_size(yaffs_obj_t *obj)
 {
 	YCHAR *alias = NULL;
 	obj = yaffs_get_equivalent_obj(obj);
 
-	switch (obj->variantType) {
+	switch (obj->variant_type) {
 	case YAFFS_OBJECT_TYPE_FILE:
-		return obj->variant.fileVariant.fileSize;
+		return obj->variant.file_variant.file_size;
 	case YAFFS_OBJECT_TYPE_SYMLINK:
-		alias = obj->variant.symLinkVariant.alias;
+		alias = obj->variant.symlink_variant.alias;
 		if(!alias)
 			return 0;
 		return yaffs_strnlen(alias,YAFFS_MAX_ALIAS_LENGTH);
@@ -3845,15 +3845,15 @@ loff_t yaffs_get_file_size(yaffs_Object *obj)
 
 
 
-int yaffs_flush_file(yaffs_Object *in, int updateTime, int dataSync)
+int yaffs_flush_file(yaffs_obj_t *in, int update_time, int data_sync)
 {
 	int retVal;
 	if (in->dirty) {
 		yaffs_flush_file_cache(in);
-		if(dataSync) /* Only sync data */
+		if(data_sync) /* Only sync data */
 			retVal=YAFFS_OK;
 		else {
-			if (updateTime) {
+			if (update_time) {
 #ifdef CONFIG_YAFFS_WINCE
 				yfsd_win_file_time_now(in->win_mtime);
 #else
@@ -3874,21 +3874,21 @@ int yaffs_flush_file(yaffs_Object *in, int updateTime, int dataSync)
 
 }
 
-static int yaffs_generic_obj_del(yaffs_Object *in)
+static int yaffs_generic_obj_del(yaffs_obj_t *in)
 {
 
 	/* First off, invalidate the file's data in the cache, without flushing. */
 	yaffs_invalidate_whole_cache(in);
 
-	if (in->myDev->param.isYaffs2 && (in->parent != in->myDev->deletedDir)) {
+	if (in->my_dev->param.is_yaffs2 && (in->parent != in->my_dev->del_dir)) {
 		/* Move to the unlinked directory so we have a record that it was deleted. */
-		yaffs_change_obj_name(in, in->myDev->deletedDir, _Y("deleted"), 0, 0);
+		yaffs_change_obj_name(in, in->my_dev->del_dir, _Y("deleted"), 0, 0);
 
 	}
 
 	yaffs_remove_obj_from_dir(in);
-	yaffs_chunk_del(in->myDev, in->hdrChunk, 1, __LINE__);
-	in->hdrChunk = 0;
+	yaffs_chunk_del(in->my_dev, in->hdr_chunk, 1, __LINE__);
+	in->hdr_chunk = 0;
 
 	yaffs_free_obj(in);
 	return YAFFS_OK;
@@ -3899,31 +3899,31 @@ static int yaffs_generic_obj_del(yaffs_Object *in)
  * and the inode associated with the file.
  * It does not delete the links associated with the file.
  */
-static int yaffs_unlink_file_if_needed(yaffs_Object *in)
+static int yaffs_unlink_file_if_needed(yaffs_obj_t *in)
 {
 
 	int retVal;
 	int immediateDeletion = 0;
-	yaffs_Device *dev = in->myDev;
+	yaffs_dev_t *dev = in->my_dev;
 
-	if (!in->myInode)
+	if (!in->my_inode)
 		immediateDeletion = 1;
 
 	if (immediateDeletion) {
 		retVal =
-		    yaffs_change_obj_name(in, in->myDev->deletedDir,
+		    yaffs_change_obj_name(in, in->my_dev->del_dir,
 					   _Y("deleted"), 0, 0);
 		T(YAFFS_TRACE_TRACING,
 		  (TSTR("yaffs: immediate deletion of file %d" TENDSTR),
-		   in->objectId));
+		   in->obj_id));
 		in->deleted = 1;
-		in->myDev->nDeletedFiles++;
-		if (dev->param.disableSoftDelete || dev->param.isYaffs2)
+		in->my_dev->n_deleted_files++;
+		if (dev->param.disable_soft_del || dev->param.is_yaffs2)
 			yaffs_resize_file(in, 0);
 		yaffs_soft_del_file(in);
 	} else {
 		retVal =
-		    yaffs_change_obj_name(in, in->myDev->unlinkedDir,
+		    yaffs_change_obj_name(in, in->my_dev->unlinked_dir,
 					   _Y("unlinked"), 0, 0);
 	}
 
@@ -3931,16 +3931,16 @@ static int yaffs_unlink_file_if_needed(yaffs_Object *in)
 	return retVal;
 }
 
-int yaffs_del_file(yaffs_Object *in)
+int yaffs_del_file(yaffs_obj_t *in)
 {
 	int retVal = YAFFS_OK;
 	int deleted; /* Need to cache value on stack if in is freed */
-	yaffs_Device *dev = in->myDev;
+	yaffs_dev_t *dev = in->my_dev;
 
-	if (dev->param.disableSoftDelete || dev->param.isYaffs2)
+	if (dev->param.disable_soft_del || dev->param.is_yaffs2)
 		yaffs_resize_file(in, 0);
 
-	if (in->nDataChunks > 0) {
+	if (in->n_data_chunks > 0) {
 		/* Use soft deletion if there is data in the file.
 		 * That won't be the case if it has been resized to zero.
 		 */
@@ -3952,27 +3952,27 @@ int yaffs_del_file(yaffs_Object *in)
 		if (retVal == YAFFS_OK && in->unlinked && !in->deleted) {
 			in->deleted = 1;
 			deleted = 1;
-			in->myDev->nDeletedFiles++;
+			in->my_dev->n_deleted_files++;
 			yaffs_soft_del_file(in);
 		}
 		return deleted ? YAFFS_OK : YAFFS_FAIL;
 	} else {
 		/* The file has no data chunks so we toss it immediately */
-		yaffs_free_tnode(in->myDev, in->variant.fileVariant.top);
-		in->variant.fileVariant.top = NULL;
+		yaffs_free_tnode(in->my_dev, in->variant.file_variant.top);
+		in->variant.file_variant.top = NULL;
 		yaffs_generic_obj_del(in);
 
 		return YAFFS_OK;
 	}
 }
 
-static int yaffs_is_non_empty_dir(yaffs_Object *obj)
+static int yaffs_is_non_empty_dir(yaffs_obj_t *obj)
 {
-	return (obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY) &&
-		!(ylist_empty(&obj->variant.directoryVariant.children));
+	return (obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY) &&
+		!(ylist_empty(&obj->variant.dir_variant.children));
 }
 
-static int yaffs_del_dir(yaffs_Object *obj)
+static int yaffs_del_dir(yaffs_obj_t *obj)
 {
 	/* First check that the directory is empty. */
 	if (yaffs_is_non_empty_dir(obj))
@@ -3981,35 +3981,35 @@ static int yaffs_del_dir(yaffs_Object *obj)
 	return yaffs_generic_obj_del(obj);
 }
 
-static int yaffs_del_symlink(yaffs_Object *in)
+static int yaffs_del_symlink(yaffs_obj_t *in)
 {
-	if(in->variant.symLinkVariant.alias)
-		YFREE(in->variant.symLinkVariant.alias);
-	in->variant.symLinkVariant.alias=NULL;
+	if(in->variant.symlink_variant.alias)
+		YFREE(in->variant.symlink_variant.alias);
+	in->variant.symlink_variant.alias=NULL;
 
 	return yaffs_generic_obj_del(in);
 }
 
-static int yaffs_del_link(yaffs_Object *in)
+static int yaffs_del_link(yaffs_obj_t *in)
 {
 	/* remove this hardlink from the list assocaited with the equivalent
 	 * object
 	 */
-	ylist_del_init(&in->hardLinks);
+	ylist_del_init(&in->hard_links);
 	return yaffs_generic_obj_del(in);
 }
 
-int yaffs_del_obj(yaffs_Object *obj)
+int yaffs_del_obj(yaffs_obj_t *obj)
 {
 int retVal = -1;
-	switch (obj->variantType) {
+	switch (obj->variant_type) {
 	case YAFFS_OBJECT_TYPE_FILE:
 		retVal = yaffs_del_file(obj);
 		break;
 	case YAFFS_OBJECT_TYPE_DIRECTORY:
-		if(!ylist_empty(&obj->variant.directoryVariant.dirty)){
-			T(YAFFS_TRACE_BACKGROUND, (TSTR("Remove object %d from dirty directories" TENDSTR),obj->objectId));
-			ylist_del_init(&obj->variant.directoryVariant.dirty);
+		if(!ylist_empty(&obj->variant.dir_variant.dirty)){
+			T(YAFFS_TRACE_BACKGROUND, (TSTR("Remove object %d from dirty directories" TENDSTR),obj->obj_id));
+			ylist_del_init(&obj->variant.dir_variant.dirty);
 		}
 		return yaffs_del_dir(obj);
 		break;
@@ -4030,20 +4030,20 @@ int retVal = -1;
 	return retVal;
 }
 
-static int yaffs_unlink_worker(yaffs_Object *obj)
+static int yaffs_unlink_worker(yaffs_obj_t *obj)
 {
 
 	int immediateDeletion = 0;
 
-	if (!obj->myInode)
+	if (!obj->my_inode)
 		immediateDeletion = 1;
 
 	if(obj)
 		yaffs_update_parent(obj->parent);
 
-	if (obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) {
 		return yaffs_del_link(obj);
-	} else if (!ylist_empty(&obj->hardLinks)) {
+	} else if (!ylist_empty(&obj->hard_links)) {
 		/* Curve ball: We're unlinking an object that has a hardlink.
 		 *
 		 * This problem arises because we are not strictly following
@@ -4058,19 +4058,19 @@ static int yaffs_unlink_worker(yaffs_Object *obj)
 		 * - Delete the hardlink
 		 */
 
-		yaffs_Object *hl;
-		yaffs_Object *parent;
+		yaffs_obj_t *hl;
+		yaffs_obj_t *parent;
 		int retVal;
 		YCHAR name[YAFFS_MAX_NAME_LENGTH + 1];
 
-		hl = ylist_entry(obj->hardLinks.next, yaffs_Object, hardLinks);
+		hl = ylist_entry(obj->hard_links.next, yaffs_obj_t, hard_links);
 
 		yaffs_get_obj_name(hl, name, YAFFS_MAX_NAME_LENGTH + 1);
 		parent = hl->parent;
 
-		ylist_del_init(&hl->hardLinks);
+		ylist_del_init(&hl->hard_links);
 
- 		yaffs_add_obj_to_dir(obj->myDev->unlinkedDir, hl);
+ 		yaffs_add_obj_to_dir(obj->my_dev->unlinked_dir, hl);
 
 		retVal = yaffs_change_obj_name(obj,parent, name, 0, 0);
 
@@ -4080,12 +4080,12 @@ static int yaffs_unlink_worker(yaffs_Object *obj)
 		return retVal;
 
 	} else if (immediateDeletion) {
-		switch (obj->variantType) {
+		switch (obj->variant_type) {
 		case YAFFS_OBJECT_TYPE_FILE:
 			return yaffs_del_file(obj);
 			break;
 		case YAFFS_OBJECT_TYPE_DIRECTORY:
-			ylist_del_init(&obj->variant.directoryVariant.dirty);
+			ylist_del_init(&obj->variant.dir_variant.dirty);
 			return yaffs_del_dir(obj);
 			break;
 		case YAFFS_OBJECT_TYPE_SYMLINK:
@@ -4102,23 +4102,23 @@ static int yaffs_unlink_worker(yaffs_Object *obj)
 	} else if(yaffs_is_non_empty_dir(obj))
 		return YAFFS_FAIL;
 	else
-		return yaffs_change_obj_name(obj, obj->myDev->unlinkedDir,
+		return yaffs_change_obj_name(obj, obj->my_dev->unlinked_dir,
 					   _Y("unlinked"), 0, 0);
 }
 
 
-static int yaffs_unlink_obj(yaffs_Object *obj)
+static int yaffs_unlink_obj(yaffs_obj_t *obj)
 {
 
-	if (obj && obj->unlinkAllowed)
+	if (obj && obj->unlink_allowed)
 		return yaffs_unlink_worker(obj);
 
 	return YAFFS_FAIL;
 
 }
-int yaffs_unlinker(yaffs_Object *dir, const YCHAR *name)
+int yaffs_unlinker(yaffs_obj_t *dir, const YCHAR *name)
 {
-	yaffs_Object *obj;
+	yaffs_obj_t *obj;
 
 	obj = yaffs_find_by_name(dir, name);
 	return yaffs_unlink_obj(obj);
@@ -4126,12 +4126,12 @@ int yaffs_unlinker(yaffs_Object *dir, const YCHAR *name)
 
 /*----------------------- Initialisation Scanning ---------------------- */
 
-void yaffs_handle_shadowed_obj(yaffs_Device *dev, int objId,
-				int backwardScanning)
+void yaffs_handle_shadowed_obj(yaffs_dev_t *dev, int obj_id,
+				int backward_scanning)
 {
-	yaffs_Object *obj;
+	yaffs_obj_t *obj;
 
-	if (!backwardScanning) {
+	if (!backward_scanning) {
 		/* Handle YAFFS1 forward scanning case
 		 * For YAFFS1 we always do the deletion
 		 */
@@ -4140,7 +4140,7 @@ void yaffs_handle_shadowed_obj(yaffs_Device *dev, int objId,
 		/* Handle YAFFS2 case (backward scanning)
 		 * If the shadowed object exists then ignore.
 		 */
-		obj = yaffs_find_by_number(dev, objId);
+		obj = yaffs_find_by_number(dev, obj_id);
 		if(obj)
 			return;
 	}
@@ -4149,72 +4149,72 @@ void yaffs_handle_shadowed_obj(yaffs_Device *dev, int objId,
 	 * We put it in unlinked dir to be cleaned up after the scanning
 	 */
 	obj =
-	    yaffs_find_or_create_by_number(dev, objId,
+	    yaffs_find_or_create_by_number(dev, obj_id,
 					     YAFFS_OBJECT_TYPE_FILE);
 	if (!obj)
 		return;
-	obj->isShadowed = 1;
-	yaffs_add_obj_to_dir(dev->unlinkedDir, obj);
-	obj->variant.fileVariant.shrinkSize = 0;
+	obj->is_shadowed = 1;
+	yaffs_add_obj_to_dir(dev->unlinked_dir, obj);
+	obj->variant.file_variant.shrink_size = 0;
 	obj->valid = 1;		/* So that we don't read any other info for this file */
 
 }
 
 
-void yaffs_link_fixup(yaffs_Device *dev, yaffs_Object *hardList)
+void yaffs_link_fixup(yaffs_dev_t *dev, yaffs_obj_t *hard_list)
 {
-	yaffs_Object *hl;
-	yaffs_Object *in;
+	yaffs_obj_t *hl;
+	yaffs_obj_t *in;
 
-	while (hardList) {
-		hl = hardList;
-		hardList = (yaffs_Object *) (hardList->hardLinks.next);
+	while (hard_list) {
+		hl = hard_list;
+		hard_list = (yaffs_obj_t *) (hard_list->hard_links.next);
 
 		in = yaffs_find_by_number(dev,
-					      hl->variant.hardLinkVariant.
-					      equivalentObjectId);
+					      hl->variant.hardlink_variant.
+					      equiv_id);
 
 		if (in) {
 			/* Add the hardlink pointers */
-			hl->variant.hardLinkVariant.equivalentObject = in;
-			ylist_add(&hl->hardLinks, &in->hardLinks);
+			hl->variant.hardlink_variant.equiv_obj = in;
+			ylist_add(&hl->hard_links, &in->hard_links);
 		} else {
 			/* Todo Need to report/handle this better.
 			 * Got a problem... hardlink to a non-existant object
 			 */
-			hl->variant.hardLinkVariant.equivalentObject = NULL;
-			YINIT_LIST_HEAD(&hl->hardLinks);
+			hl->variant.hardlink_variant.equiv_obj = NULL;
+			YINIT_LIST_HEAD(&hl->hard_links);
 
 		}
 	}
 }
 
 
-static void yaffs_strip_deleted_objs(yaffs_Device *dev)
+static void yaffs_strip_deleted_objs(yaffs_dev_t *dev)
 {
 	/*
 	*  Sort out state of unlinked and deleted objects after scanning.
 	*/
 	struct ylist_head *i;
 	struct ylist_head *n;
-	yaffs_Object *l;
+	yaffs_obj_t *l;
 
-	if (dev->readOnly)
+	if (dev->read_only)
 		return;
 
 	/* Soft delete all the unlinked files */
 	ylist_for_each_safe(i, n,
-		&dev->unlinkedDir->variant.directoryVariant.children) {
+		&dev->unlinked_dir->variant.dir_variant.children) {
 		if (i) {
-			l = ylist_entry(i, yaffs_Object, siblings);
+			l = ylist_entry(i, yaffs_obj_t, siblings);
 			yaffs_del_obj(l);
 		}
 	}
 
 	ylist_for_each_safe(i, n,
-		&dev->deletedDir->variant.directoryVariant.children) {
+		&dev->del_dir->variant.dir_variant.children) {
 		if (i) {
-			l = ylist_entry(i, yaffs_Object, siblings);
+			l = ylist_entry(i, yaffs_obj_t, siblings);
 			yaffs_del_obj(l);
 		}
 	}
@@ -4231,31 +4231,31 @@ static void yaffs_strip_deleted_objs(yaffs_Device *dev)
  * Note:
  *  This code assumes that we don't ever change the current relationships between
  *  directories:
- *   rootDir->parent == unlinkedDir->parent == deletedDir->parent == NULL
- *   lostNfound->parent == rootDir
+ *   root_dir->parent == unlinked_dir->parent == del_dir->parent == NULL
+ *   lostNfound->parent == root_dir
  *
  * This fixes the problem where directories might have inadvertently been deleted
  * leaving the object "hanging" without being rooted in the directory tree.
  */
  
-static int yaffs_has_null_parent(yaffs_Device *dev, yaffs_Object *obj)
+static int yaffs_has_null_parent(yaffs_dev_t *dev, yaffs_obj_t *obj)
 {
-	return (obj == dev->deletedDir ||
-		obj == dev->unlinkedDir||
-		obj == dev->rootDir);
+	return (obj == dev->del_dir ||
+		obj == dev->unlinked_dir||
+		obj == dev->root_dir);
 }
 
-static void yaffs_fix_hanging_objs(yaffs_Device *dev)
+static void yaffs_fix_hanging_objs(yaffs_dev_t *dev)
 {
-	yaffs_Object *obj;
-	yaffs_Object *parent;
+	yaffs_obj_t *obj;
+	yaffs_obj_t *parent;
 	int i;
 	struct ylist_head *lh;
 	struct ylist_head *n;
 	int depthLimit;
 	int hanging;
 
-	if (dev->readOnly)
+	if (dev->read_only)
 		return;
 
 	/* Iterate through the objects in each hash entry,
@@ -4264,16 +4264,16 @@ static void yaffs_fix_hanging_objs(yaffs_Device *dev)
 	 */
 
 	for (i = 0; i <  YAFFS_NOBJECT_BUCKETS; i++) {
-		ylist_for_each_safe(lh, n, &dev->objectBucket[i].list) {
+		ylist_for_each_safe(lh, n, &dev->obj_bucket[i].list) {
 			if (lh) {
-				obj = ylist_entry(lh, yaffs_Object, hashLink);
+				obj = ylist_entry(lh, yaffs_obj_t, hash_link);
 				parent= obj->parent;
 				
 				if(yaffs_has_null_parent(dev,obj)){
 					/* These directories are not hanging */
 					hanging = 0;
 				}
-				else if(!parent || parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+				else if(!parent || parent->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
 					hanging = 1;
 				else if(yaffs_has_null_parent(dev,parent))
 					hanging = 0;
@@ -4284,21 +4284,21 @@ static void yaffs_fix_hanging_objs(yaffs_Device *dev)
 					hanging = 0;
 					depthLimit=100;
 
-					while(parent != dev->rootDir &&
+					while(parent != dev->root_dir &&
 						parent->parent &&
-						parent->parent->variantType == YAFFS_OBJECT_TYPE_DIRECTORY &&
+						parent->parent->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY &&
 						depthLimit > 0){
 						parent = parent->parent;
 						depthLimit--;
 					}
-					if(parent != dev->rootDir)
+					if(parent != dev->root_dir)
 						hanging = 1;
 				}
 				if(hanging){
 					T(YAFFS_TRACE_SCAN,
 					  (TSTR("Hanging object %d moved to lost and found" TENDSTR),
-					  	obj->objectId));
-					yaffs_add_obj_to_dir(dev->lostNFoundDir,obj);
+					  	obj->obj_id));
+					yaffs_add_obj_to_dir(dev->lost_n_found,obj);
 				}
 			}
 		}
@@ -4309,24 +4309,24 @@ static void yaffs_fix_hanging_objs(yaffs_Device *dev)
 /*
  * Delete directory contents for cleaning up lost and found.
  */
-static void yaffs_del_dir_contents(yaffs_Object *dir)
+static void yaffs_del_dir_contents(yaffs_obj_t *dir)
 {
-	yaffs_Object *obj;
+	yaffs_obj_t *obj;
 	struct ylist_head *lh;
 	struct ylist_head *n;
 
-	if(dir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+	if(dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY)
 		YBUG();
 	
-	ylist_for_each_safe(lh, n, &dir->variant.directoryVariant.children) {
+	ylist_for_each_safe(lh, n, &dir->variant.dir_variant.children) {
 		if (lh) {
-			obj = ylist_entry(lh, yaffs_Object, siblings);
-			if(obj->variantType == YAFFS_OBJECT_TYPE_DIRECTORY)
+			obj = ylist_entry(lh, yaffs_obj_t, siblings);
+			if(obj->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY)
 				yaffs_del_dir_contents(obj);
 
 			T(YAFFS_TRACE_SCAN,
 				(TSTR("Deleting lost_found object %d" TENDSTR),
-				obj->objectId));
+				obj->obj_id));
 
 			/* Need to use UnlinkObject since Delete would not handle
 			 * hardlinked objects correctly.
@@ -4337,37 +4337,37 @@ static void yaffs_del_dir_contents(yaffs_Object *dir)
 			
 }
 
-static void yaffs_empty_l_n_f(yaffs_Device *dev)
+static void yaffs_empty_l_n_f(yaffs_dev_t *dev)
 {
-	yaffs_del_dir_contents(dev->lostNFoundDir);
+	yaffs_del_dir_contents(dev->lost_n_found);
 }
 
-static void yaffs_check_obj_details_loaded(yaffs_Object *in)
+static void yaffs_check_obj_details_loaded(yaffs_obj_t *in)
 {
 	__u8 *chunkData;
-	yaffs_ObjectHeader *oh;
-	yaffs_Device *dev;
-	yaffs_ExtendedTags tags;
+	yaffs_obj_header *oh;
+	yaffs_dev_t *dev;
+	yaffs_ext_tags tags;
 	int result;
 	int alloc_failed = 0;
 
 	if (!in)
 		return;
 
-	dev = in->myDev;
+	dev = in->my_dev;
 
 #if 0
 	T(YAFFS_TRACE_SCAN, (TSTR("details for object %d %s loaded" TENDSTR),
-		in->objectId,
-		in->lazyLoaded ? "not yet" : "already"));
+		in->obj_id,
+		in->lazy_loaded ? "not yet" : "already"));
 #endif
 
-	if (in->lazyLoaded && in->hdrChunk > 0) {
-		in->lazyLoaded = 0;
+	if (in->lazy_loaded && in->hdr_chunk > 0) {
+		in->lazy_loaded = 0;
 		chunkData = yaffs_get_temp_buffer(dev, __LINE__);
 
-		result = yaffs_rd_chunk_tags_nand(dev, in->hdrChunk, chunkData, &tags);
-		oh = (yaffs_ObjectHeader *) chunkData;
+		result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, chunkData, &tags);
+		oh = (yaffs_obj_header *) chunkData;
 
 		in->yst_mode = oh->yst_mode;
 #ifdef CONFIG_YAFFS_WINCE
@@ -4388,10 +4388,10 @@ static void yaffs_check_obj_details_loaded(yaffs_Object *in)
 #endif
 		yaffs_set_obj_name_from_oh(in, oh);
 
-		if (in->variantType == YAFFS_OBJECT_TYPE_SYMLINK) {
-			in->variant.symLinkVariant.alias =
+		if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) {
+			in->variant.symlink_variant.alias =
 						    yaffs_clone_str(oh->alias);
-			if (!in->variant.symLinkVariant.alias)
+			if (!in->variant.symlink_variant.alias)
 				alloc_failed = 1; /* Not returned to caller */
 		}
 
@@ -4417,22 +4417,22 @@ static void yaffs_check_obj_details_loaded(yaffs_Object *in)
  * called periodically.
  */
  
-static void yaffs_update_parent(yaffs_Object *obj)
+static void yaffs_update_parent(yaffs_obj_t *obj)
 {
-	yaffs_Device *dev;
+	yaffs_dev_t *dev;
 	if(!obj)
 		return;
 #ifndef CONFIG_YAFFS_WINCE
 
-	dev = obj->myDev;
+	dev = obj->my_dev;
 	obj->dirty = 1;
 	obj->yst_mtime = obj->yst_ctime = Y_CURRENT_TIME;
-	if(dev->param.deferDirectoryUpdate){
-		struct ylist_head *link = &obj->variant.directoryVariant.dirty; 
+	if(dev->param.defered_dir_update){
+		struct ylist_head *link = &obj->variant.dir_variant.dirty; 
 	
 		if(ylist_empty(link)){
-			ylist_add(link,&dev->dirtyDirectories);
-			T(YAFFS_TRACE_BACKGROUND, (TSTR("Added object %d to dirty directories" TENDSTR),obj->objectId));
+			ylist_add(link,&dev->dirty_dirs);
+			T(YAFFS_TRACE_BACKGROUND, (TSTR("Added object %d to dirty directories" TENDSTR),obj->obj_id));
 		}
 
 	} else
@@ -4440,42 +4440,42 @@ static void yaffs_update_parent(yaffs_Object *obj)
 #endif
 }
 
-void yaffs_update_dirty_dirs(yaffs_Device *dev)
+void yaffs_update_dirty_dirs(yaffs_dev_t *dev)
 {
 	struct ylist_head *link;
-	yaffs_Object *obj;
-	yaffs_DirectoryStructure *dS;
-	yaffs_ObjectVariant *oV;
+	yaffs_obj_t *obj;
+	yaffs_dir_s *dS;
+	yaffs_obj_variant *oV;
 
 	T(YAFFS_TRACE_BACKGROUND, (TSTR("Update dirty directories" TENDSTR)));
 
-	while(!ylist_empty(&dev->dirtyDirectories)){
-		link = dev->dirtyDirectories.next;
+	while(!ylist_empty(&dev->dirty_dirs)){
+		link = dev->dirty_dirs.next;
 		ylist_del_init(link);
 		
-		dS=ylist_entry(link,yaffs_DirectoryStructure,dirty);
-		oV = ylist_entry(dS,yaffs_ObjectVariant,directoryVariant);
-		obj = ylist_entry(oV,yaffs_Object,variant);
+		dS=ylist_entry(link,yaffs_dir_s,dirty);
+		oV = ylist_entry(dS,yaffs_obj_variant,dir_variant);
+		obj = ylist_entry(oV,yaffs_obj_t,variant);
 
-		T(YAFFS_TRACE_BACKGROUND, (TSTR("Update directory %d" TENDSTR), obj->objectId));
+		T(YAFFS_TRACE_BACKGROUND, (TSTR("Update directory %d" TENDSTR), obj->obj_id));
 
 		if(obj->dirty)
 			yaffs_update_oh(obj, NULL, 0, 0, 0, NULL);
 	}
 }
 
-static void yaffs_remove_obj_from_dir(yaffs_Object *obj)
+static void yaffs_remove_obj_from_dir(yaffs_obj_t *obj)
 {
-	yaffs_Device *dev = obj->myDev;
-	yaffs_Object *parent;
+	yaffs_dev_t *dev = obj->my_dev;
+	yaffs_obj_t *parent;
 
 	yaffs_verify_obj_in_dir(obj);
 	parent = obj->parent;
 
 	yaffs_verify_dir(parent);
 
-	if (dev && dev->param.removeObjectCallback)
-		dev->param.removeObjectCallback(obj);
+	if (dev && dev->param.remove_obj_fn)
+		dev->param.remove_obj_fn(obj);
 
 
 	ylist_del_init(&obj->siblings);
@@ -4484,8 +4484,8 @@ static void yaffs_remove_obj_from_dir(yaffs_Object *obj)
 	yaffs_verify_dir(parent);
 }
 
-void yaffs_add_obj_to_dir(yaffs_Object *directory,
-					yaffs_Object *obj)
+void yaffs_add_obj_to_dir(yaffs_obj_t *directory,
+					yaffs_obj_t *obj)
 {
 	if (!directory) {
 		T(YAFFS_TRACE_ALWAYS,
@@ -4495,7 +4495,7 @@ void yaffs_add_obj_to_dir(yaffs_Object *directory,
 		YBUG();
 		return;
 	}
-	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+	if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
 		T(YAFFS_TRACE_ALWAYS,
 		  (TSTR
 		   ("tragedy: Trying to add an object to a non-directory"
@@ -4515,21 +4515,21 @@ void yaffs_add_obj_to_dir(yaffs_Object *directory,
 
 
 	/* Now add it */
-	ylist_add(&obj->siblings, &directory->variant.directoryVariant.children);
+	ylist_add(&obj->siblings, &directory->variant.dir_variant.children);
 	obj->parent = directory;
 
-	if (directory == obj->myDev->unlinkedDir
-			|| directory == obj->myDev->deletedDir) {
+	if (directory == obj->my_dev->unlinked_dir
+			|| directory == obj->my_dev->del_dir) {
 		obj->unlinked = 1;
-		obj->myDev->nUnlinkedFiles++;
-		obj->renameAllowed = 0;
+		obj->my_dev->n_unlinked_files++;
+		obj->rename_allowed = 0;
 	}
 
 	yaffs_verify_dir(directory);
 	yaffs_verify_obj_in_dir(obj);
 }
 
-yaffs_Object *yaffs_find_by_name(yaffs_Object *directory,
+yaffs_obj_t *yaffs_find_by_name(yaffs_obj_t *directory,
 				     const YCHAR *name)
 {
 	int sum;
@@ -4537,7 +4537,7 @@ yaffs_Object *yaffs_find_by_name(yaffs_Object *directory,
 	struct ylist_head *i;
 	YCHAR buffer[YAFFS_MAX_NAME_LENGTH + 1];
 
-	yaffs_Object *l;
+	yaffs_obj_t *l;
 
 	if (!name)
 		return NULL;
@@ -4550,7 +4550,7 @@ yaffs_Object *yaffs_find_by_name(yaffs_Object *directory,
 		YBUG();
 		return NULL;
 	}
-	if (directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+	if (directory->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
 		T(YAFFS_TRACE_ALWAYS,
 		  (TSTR
 		   ("tragedy: yaffs_find_by_name: non-directory" TENDSTR)));
@@ -4559,9 +4559,9 @@ yaffs_Object *yaffs_find_by_name(yaffs_Object *directory,
 
 	sum = yaffs_calc_name_sum(name);
 
-	ylist_for_each(i, &directory->variant.directoryVariant.children) {
+	ylist_for_each(i, &directory->variant.dir_variant.children) {
 		if (i) {
-			l = ylist_entry(i, yaffs_Object, siblings);
+			l = ylist_entry(i, yaffs_obj_t, siblings);
 
 			if (l->parent != directory)
 				YBUG();
@@ -4569,10 +4569,10 @@ yaffs_Object *yaffs_find_by_name(yaffs_Object *directory,
 			yaffs_check_obj_details_loaded(l);
 
 			/* Special case for lost-n-found */
-			if (l->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
+			if (l->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
 				if (yaffs_strcmp(name, YAFFS_LOSTNFOUND_NAME) == 0)
 					return l;
-			} else if (yaffs_sum_cmp(l->sum, sum) || l->hdrChunk <= 0) {
+			} else if (yaffs_sum_cmp(l->sum, sum) || l->hdr_chunk <= 0) {
 				/* LostnFound chunk called Objxxx
 				 * Do a real check
 				 */
@@ -4589,13 +4589,13 @@ yaffs_Object *yaffs_find_by_name(yaffs_Object *directory,
 
 
 #if 0
-int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
-					int (*fn) (yaffs_Object *))
+int yaffs_ApplyToDirectoryChildren(yaffs_obj_t *the_dir,
+					int (*fn) (yaffs_obj_t *))
 {
 	struct ylist_head *i;
-	yaffs_Object *l;
+	yaffs_obj_t *l;
 
-	if (!theDir) {
+	if (!the_dir) {
 		T(YAFFS_TRACE_ALWAYS,
 		  (TSTR
 		   ("tragedy: yaffs_find_by_name: null pointer directory"
@@ -4603,7 +4603,7 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
 		YBUG();
 		return YAFFS_FAIL;
 	}
-	if (theDir->variantType != YAFFS_OBJECT_TYPE_DIRECTORY) {
+	if (the_dir->variant_type != YAFFS_OBJECT_TYPE_DIRECTORY) {
 		T(YAFFS_TRACE_ALWAYS,
 		  (TSTR
 		   ("tragedy: yaffs_find_by_name: non-directory" TENDSTR)));
@@ -4611,9 +4611,9 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
 		return YAFFS_FAIL;
 	}
 
-	ylist_for_each(i, &theDir->variant.directoryVariant.children) {
+	ylist_for_each(i, &the_dir->variant.dir_variant.children) {
 		if (i) {
-			l = ylist_entry(i, yaffs_Object, siblings);
+			l = ylist_entry(i, yaffs_obj_t, siblings);
 			if (l && !fn(l))
 				return YAFFS_FAIL;
 		}
@@ -4628,11 +4628,11 @@ int yaffs_ApplyToDirectoryChildren(yaffs_Object *theDir,
  * actual object.
  */
 
-yaffs_Object *yaffs_get_equivalent_obj(yaffs_Object *obj)
+yaffs_obj_t *yaffs_get_equivalent_obj(yaffs_obj_t *obj)
 {
-	if (obj && obj->variantType == YAFFS_OBJECT_TYPE_HARDLINK) {
+	if (obj && obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) {
 		/* We want the object id of the equivalent object, not this one */
-		obj = obj->variant.hardLinkVariant.equivalentObject;
+		obj = obj->variant.hardlink_variant.equiv_obj;
 		yaffs_check_obj_details_loaded(obj);
 	}
 	return obj;
@@ -4657,14 +4657,14 @@ yaffs_Object *yaffs_get_equivalent_obj(yaffs_Object *obj)
  *    starting at oh->name[1].
 
  */
-static void yaffs_fix_null_name(yaffs_Object * obj,YCHAR * name, int buffSize)
+static void yaffs_fix_null_name(yaffs_obj_t * obj,YCHAR * name, int buffer_size)
 {
 	/* Create an object name if we could not find one. */
 	if(yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH) == 0){
 		YCHAR locName[20];
 		YCHAR numString[20];
 		YCHAR *x = &numString[19];
-		unsigned v = obj->objectId;
+		unsigned v = obj->obj_id;
 		numString[19] = 0;
 		while(v>0){
 			x--;
@@ -4674,14 +4674,14 @@ static void yaffs_fix_null_name(yaffs_Object * obj,YCHAR * name, int buffSize)
 		/* make up a name */
 		yaffs_strcpy(locName, YAFFS_LOSTNFOUND_PREFIX);
 		yaffs_strcat(locName,x);
-		yaffs_strncpy(name, locName, buffSize - 1);
+		yaffs_strncpy(name, locName, buffer_size - 1);
 	}
 }
 
-static void yaffs_load_name_from_oh(yaffs_Device *dev,YCHAR *name, const YCHAR *ohName, int bufferSize)
+static void yaffs_load_name_from_oh(yaffs_dev_t *dev,YCHAR *name, const YCHAR *ohName, int bufferSize)
 {
 #ifdef CONFIG_YAFFS_AUTO_UNICODE
-	if(dev->param.autoUnicode){
+	if(dev->param.auto_unicode){
 		if(*ohName){
 			/* It is an ASCII name, so do an ASCII to unicode conversion */
 			const char *asciiOhName = (const char *)ohName;
@@ -4700,14 +4700,14 @@ static void yaffs_load_name_from_oh(yaffs_Device *dev,YCHAR *name, const YCHAR *
 }
 
 
-static void yaffs_load_oh_from_name(yaffs_Device *dev, YCHAR *ohName, const YCHAR *name)
+static void yaffs_load_oh_from_name(yaffs_dev_t *dev, YCHAR *ohName, const YCHAR *name)
 {
 #ifdef CONFIG_YAFFS_AUTO_UNICODE
 
 	int isAscii;
 	YCHAR *w;
 
-	if(dev->param.autoUnicode){
+	if(dev->param.auto_unicode){
 
 		isAscii = 1;
 		w = name;
@@ -4741,62 +4741,62 @@ static void yaffs_load_oh_from_name(yaffs_Device *dev, YCHAR *ohName, const YCHA
 
 }
 
-int yaffs_get_obj_name(yaffs_Object * obj, YCHAR * name, int buffSize)
+int yaffs_get_obj_name(yaffs_obj_t * obj, YCHAR * name, int buffer_size)
 {
-	memset(name, 0, buffSize * sizeof(YCHAR));
+	memset(name, 0, buffer_size * sizeof(YCHAR));
 	
 	yaffs_check_obj_details_loaded(obj);
 
-	if (obj->objectId == YAFFS_OBJECTID_LOSTNFOUND) {
-		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffSize - 1);
+	if (obj->obj_id == YAFFS_OBJECTID_LOSTNFOUND) {
+		yaffs_strncpy(name, YAFFS_LOSTNFOUND_NAME, buffer_size - 1);
 	} 
 #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
-	else if (obj->shortName[0]) {
-		yaffs_strcpy(name, obj->shortName);
+	else if (obj->short_name[0]) {
+		yaffs_strcpy(name, obj->short_name);
 	}
 #endif
-	else if(obj->hdrChunk > 0) {
+	else if(obj->hdr_chunk > 0) {
 		int result;
-		__u8 *buffer = yaffs_get_temp_buffer(obj->myDev, __LINE__);
+		__u8 *buffer = yaffs_get_temp_buffer(obj->my_dev, __LINE__);
 
-		yaffs_ObjectHeader *oh = (yaffs_ObjectHeader *) buffer;
+		yaffs_obj_header *oh = (yaffs_obj_header *) buffer;
 
-		memset(buffer, 0, obj->myDev->nDataBytesPerChunk);
+		memset(buffer, 0, obj->my_dev->data_bytes_per_chunk);
 
-		if (obj->hdrChunk > 0) {
-			result = yaffs_rd_chunk_tags_nand(obj->myDev,
-							obj->hdrChunk, buffer,
+		if (obj->hdr_chunk > 0) {
+			result = yaffs_rd_chunk_tags_nand(obj->my_dev,
+							obj->hdr_chunk, buffer,
 							NULL);
 		}
-		yaffs_load_name_from_oh(obj->myDev,name,oh->name,buffSize);
+		yaffs_load_name_from_oh(obj->my_dev,name,oh->name,buffer_size);
 
-		yaffs_release_temp_buffer(obj->myDev, buffer, __LINE__);
+		yaffs_release_temp_buffer(obj->my_dev, buffer, __LINE__);
 	}
 
-	yaffs_fix_null_name(obj,name,buffSize);
+	yaffs_fix_null_name(obj,name,buffer_size);
 
 	return yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH);
 }
 
 
-int yaffs_get_obj_length(yaffs_Object *obj)
+int yaffs_get_obj_length(yaffs_obj_t *obj)
 {
 	/* Dereference any hard linking */
 	obj = yaffs_get_equivalent_obj(obj);
 
-	if (obj->variantType == YAFFS_OBJECT_TYPE_FILE)
-		return obj->variant.fileVariant.fileSize;
-	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK){
-		if(!obj->variant.symLinkVariant.alias)
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE)
+		return obj->variant.file_variant.file_size;
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK){
+		if(!obj->variant.symlink_variant.alias)
 			return 0;
-		return yaffs_strnlen(obj->variant.symLinkVariant.alias,YAFFS_MAX_ALIAS_LENGTH);
+		return yaffs_strnlen(obj->variant.symlink_variant.alias,YAFFS_MAX_ALIAS_LENGTH);
 	} else {
 		/* Only a directory should drop through to here */
-		return obj->myDev->nDataBytesPerChunk;
+		return obj->my_dev->data_bytes_per_chunk;
 	}
 }
 
-int yaffs_get_obj_link_count(yaffs_Object *obj)
+int yaffs_get_obj_link_count(yaffs_obj_t *obj)
 {
 	int count = 0;
 	struct ylist_head *i;
@@ -4804,24 +4804,24 @@ int yaffs_get_obj_link_count(yaffs_Object *obj)
 	if (!obj->unlinked)
 		count++;		/* the object itself */
 
-	ylist_for_each(i, &obj->hardLinks)
+	ylist_for_each(i, &obj->hard_links)
 		count++;		/* add the hard links; */
 
 	return count;
 }
 
-int yaffs_get_obj_inode(yaffs_Object *obj)
+int yaffs_get_obj_inode(yaffs_obj_t *obj)
 {
 	obj = yaffs_get_equivalent_obj(obj);
 
-	return obj->objectId;
+	return obj->obj_id;
 }
 
-unsigned yaffs_get_obj_type(yaffs_Object *obj)
+unsigned yaffs_get_obj_type(yaffs_obj_t *obj)
 {
 	obj = yaffs_get_equivalent_obj(obj);
 
-	switch (obj->variantType) {
+	switch (obj->variant_type) {
 	case YAFFS_OBJECT_TYPE_FILE:
 		return DT_REG;
 		break;
@@ -4849,18 +4849,18 @@ unsigned yaffs_get_obj_type(yaffs_Object *obj)
 	}
 }
 
-YCHAR *yaffs_get_symlink_alias(yaffs_Object *obj)
+YCHAR *yaffs_get_symlink_alias(yaffs_obj_t *obj)
 {
 	obj = yaffs_get_equivalent_obj(obj);
-	if (obj->variantType == YAFFS_OBJECT_TYPE_SYMLINK)
-		return yaffs_clone_str(obj->variant.symLinkVariant.alias);
+	if (obj->variant_type == YAFFS_OBJECT_TYPE_SYMLINK)
+		return yaffs_clone_str(obj->variant.symlink_variant.alias);
 	else
 		return yaffs_clone_str(_Y(""));
 }
 
 #ifndef CONFIG_YAFFS_WINCE
 
-int yaffs_set_attribs(yaffs_Object *obj, struct iattr *attr)
+int yaffs_set_attribs(yaffs_obj_t *obj, struct iattr *attr)
 {
 	unsigned int valid = attr->ia_valid;
 
@@ -4886,7 +4886,7 @@ int yaffs_set_attribs(yaffs_Object *obj, struct iattr *attr)
 	return YAFFS_OK;
 
 }
-int yaffs_get_attribs(yaffs_Object *obj, struct iattr *attr)
+int yaffs_get_attribs(yaffs_obj_t *obj, struct iattr *attr)
 {
 	unsigned int valid = 0;
 
@@ -4915,7 +4915,7 @@ int yaffs_get_attribs(yaffs_Object *obj, struct iattr *attr)
 #endif
 
 
-static int yaffs_do_xattrib_mod(yaffs_Object *obj, int set, const YCHAR *name, const void *value, int size, int flags)
+static int yaffs_do_xattrib_mod(yaffs_obj_t *obj, int set, const YCHAR *name, const void *value, int size, int flags)
 {
 	yaffs_xattr_mod xmod;
 
@@ -4936,12 +4936,12 @@ static int yaffs_do_xattrib_mod(yaffs_Object *obj, int set, const YCHAR *name, c
 		return -ENOSPC;
 }
 
-static int yaffs_apply_xattrib_mod(yaffs_Object *obj, char *buffer, yaffs_xattr_mod *xmod)
+static int yaffs_apply_xattrib_mod(yaffs_obj_t *obj, char *buffer, yaffs_xattr_mod *xmod)
 {
 	int retval = 0;
-	int x_offs = sizeof(yaffs_ObjectHeader);
-	yaffs_Device *dev = obj->myDev;
-	int x_size = dev->nDataBytesPerChunk - sizeof(yaffs_ObjectHeader);
+	int x_offs = sizeof(yaffs_obj_header);
+	yaffs_dev_t *dev = obj->my_dev;
+	int x_size = dev->data_bytes_per_chunk - sizeof(yaffs_obj_header);
 
 	char * x_buffer = buffer + x_offs;
 
@@ -4950,34 +4950,34 @@ static int yaffs_apply_xattrib_mod(yaffs_Object *obj, char *buffer, yaffs_xattr_
 	else
 		retval = nval_del(x_buffer, x_size, xmod->name);
 
-	obj->hasXattr = nval_hasvalues(x_buffer, x_size);
-	obj->xattrKnown = 1;
+	obj->has_xattr = nval_hasvalues(x_buffer, x_size);
+	obj->xattr_known = 1;
 
 	xmod->result = retval;
 
 	return retval;
 }
 
-static int yaffs_do_xattrib_fetch(yaffs_Object *obj, const YCHAR *name, void *value, int size)
+static int yaffs_do_xattrib_fetch(yaffs_obj_t *obj, const YCHAR *name, void *value, int size)
 {
 	char *buffer = NULL;
 	int result;
-	yaffs_ExtendedTags tags;
-	yaffs_Device *dev = obj->myDev;
-	int x_offs = sizeof(yaffs_ObjectHeader);
-	int x_size = dev->nDataBytesPerChunk - sizeof(yaffs_ObjectHeader);
+	yaffs_ext_tags tags;
+	yaffs_dev_t *dev = obj->my_dev;
+	int x_offs = sizeof(yaffs_obj_header);
+	int x_size = dev->data_bytes_per_chunk - sizeof(yaffs_obj_header);
 
 	char * x_buffer;
 
 	int retval = 0;
 
-	if(obj->hdrChunk < 1)
+	if(obj->hdr_chunk < 1)
 		return -ENODATA;
 
 	/* If we know that the object has no xattribs then don't do all the
 	 * reading and parsing.
 	 */
-	if(obj->xattrKnown && !obj->hasXattr){
+	if(obj->xattr_known && !obj->has_xattr){
 		if(name)
 			return -ENODATA;
 		else
@@ -4988,16 +4988,16 @@ static int yaffs_do_xattrib_fetch(yaffs_Object *obj, const YCHAR *name, void *va
 	if(!buffer)
 		return -ENOMEM;
 
-	result = yaffs_rd_chunk_tags_nand(dev,obj->hdrChunk, (__u8 *)buffer, &tags);
+	result = yaffs_rd_chunk_tags_nand(dev,obj->hdr_chunk, (__u8 *)buffer, &tags);
 
 	if(result != YAFFS_OK)
 		retval = -ENOENT;
 	else{
 		x_buffer =  buffer + x_offs;
 
-		if (!obj->xattrKnown){
-			obj->hasXattr = nval_hasvalues(x_buffer, x_size);
-			obj->xattrKnown = 1;
+		if (!obj->xattr_known){
+			obj->has_xattr = nval_hasvalues(x_buffer, x_size);
+			obj->xattr_known = 1;
 		}
 
 		if(name)
@@ -5009,22 +5009,22 @@ static int yaffs_do_xattrib_fetch(yaffs_Object *obj, const YCHAR *name, void *va
 	return retval;
 }
 
-int yaffs_set_xattrib(yaffs_Object *obj, const YCHAR *name, const void * value, int size, int flags)
+int yaffs_set_xattrib(yaffs_obj_t *obj, const YCHAR *name, const void * value, int size, int flags)
 {
 	return yaffs_do_xattrib_mod(obj, 1, name, value, size, flags);
 }
 
-int yaffs_remove_xattrib(yaffs_Object *obj, const YCHAR *name)
+int yaffs_remove_xattrib(yaffs_obj_t *obj, const YCHAR *name)
 {
 	return yaffs_do_xattrib_mod(obj, 0, name, NULL, 0, 0);
 }
 
-int yaffs_get_xattrib(yaffs_Object *obj, const YCHAR *name, void *value, int size)
+int yaffs_get_xattrib(yaffs_obj_t *obj, const YCHAR *name, void *value, int size)
 {
 	return yaffs_do_xattrib_fetch(obj, name, value, size);
 }
 
-int yaffs_list_xattrib(yaffs_Object *obj, char *buffer, int size)
+int yaffs_list_xattrib(yaffs_obj_t *obj, char *buffer, int size)
 {
 	return yaffs_do_xattrib_fetch(obj, NULL, buffer,size);
 }
@@ -5032,7 +5032,7 @@ int yaffs_list_xattrib(yaffs_Object *obj, char *buffer, int size)
 
 
 #if 0
-int yaffs_dump_obj(yaffs_Object *obj)
+int yaffs_dump_obj(yaffs_obj_t *obj)
 {
 	YCHAR name[257];
 
@@ -5042,8 +5042,8 @@ int yaffs_dump_obj(yaffs_Object *obj)
 	  (TSTR
 	   ("Object %d, inode %d \"%s\"\n dirty %d valid %d serial %d sum %d"
 	    " chunk %d type %d size %d\n"
-	    TENDSTR), obj->objectId, yaffs_get_obj_inode(obj), name,
-	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdrChunk,
+	    TENDSTR), obj->obj_id, yaffs_get_obj_inode(obj), name,
+	   obj->dirty, obj->valid, obj->serial, obj->sum, obj->hdr_chunk,
 	   yaffs_get_obj_type(obj), yaffs_get_obj_length(obj)));
 
 	return YAFFS_OK;
@@ -5052,68 +5052,68 @@ int yaffs_dump_obj(yaffs_Object *obj)
 
 /*---------------------------- Initialisation code -------------------------------------- */
 
-static int yaffs_cehck_dev_fns(const yaffs_Device *dev)
+static int yaffs_cehck_dev_fns(const yaffs_dev_t *dev)
 {
 
 	/* Common functions, gotta have */
-	if (!dev->param.eraseBlockInNAND || !dev->param.initialiseNAND)
+	if (!dev->param.erase_fn || !dev->param.initialise_flash_fn)
 		return 0;
 
 #ifdef CONFIG_YAFFS_YAFFS2
 
 	/* Can use the "with tags" style interface for yaffs1 or yaffs2 */
-	if (dev->param.writeChunkWithTagsToNAND &&
-	    dev->param.readChunkWithTagsFromNAND &&
-	    !dev->param.writeChunkToNAND &&
-	    !dev->param.readChunkFromNAND &&
-	    dev->param.markNANDBlockBad &&
-	    dev->param.queryNANDBlock)
+	if (dev->param.write_chunk_tags_fn &&
+	    dev->param.read_chunk_tags_fn &&
+	    !dev->param.write_chunk_fn &&
+	    !dev->param.read_chunk_fn &&
+	    dev->param.bad_block_fn &&
+	    dev->param.query_block_fn)
 		return 1;
 #endif
 
 	/* Can use the "spare" style interface for yaffs1 */
-	if (!dev->param.isYaffs2 &&
-	    !dev->param.writeChunkWithTagsToNAND &&
-	    !dev->param.readChunkWithTagsFromNAND &&
-	    dev->param.writeChunkToNAND &&
-	    dev->param.readChunkFromNAND &&
-	    !dev->param.markNANDBlockBad &&
-	    !dev->param.queryNANDBlock)
+	if (!dev->param.is_yaffs2 &&
+	    !dev->param.write_chunk_tags_fn &&
+	    !dev->param.read_chunk_tags_fn &&
+	    dev->param.write_chunk_fn &&
+	    dev->param.read_chunk_fn &&
+	    !dev->param.bad_block_fn &&
+	    !dev->param.query_block_fn)
 		return 1;
 
 	return 0;	/* bad */
 }
 
 
-static int yaffs_create_initial_dir(yaffs_Device *dev)
+static int yaffs_create_initial_dir(yaffs_dev_t *dev)
 {
 	/* Initialise the unlinked, deleted, root and lost and found directories */
 
-	dev->lostNFoundDir = dev->rootDir =  NULL;
-	dev->unlinkedDir = dev->deletedDir = NULL;
+	dev->lost_n_found = dev->root_dir =  NULL;
+	dev->unlinked_dir = dev->del_dir = NULL;
 
-	dev->unlinkedDir =
+	dev->unlinked_dir =
 	    yaffs_create_fake_dir(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR);
 
-	dev->deletedDir =
+	dev->del_dir =
 	    yaffs_create_fake_dir(dev, YAFFS_OBJECTID_DELETED, S_IFDIR);
 
-	dev->rootDir =
+	dev->root_dir =
 	    yaffs_create_fake_dir(dev, YAFFS_OBJECTID_ROOT,
 				      YAFFS_ROOT_MODE | S_IFDIR);
-	dev->lostNFoundDir =
+	dev->lost_n_found =
 	    yaffs_create_fake_dir(dev, YAFFS_OBJECTID_LOSTNFOUND,
 				      YAFFS_LOSTNFOUND_MODE | S_IFDIR);
 
-	if (dev->lostNFoundDir && dev->rootDir && dev->unlinkedDir && dev->deletedDir) {
-		yaffs_add_obj_to_dir(dev->rootDir, dev->lostNFoundDir);
+	if (dev->lost_n_found && dev->root_dir && dev->unlinked_dir && dev->del_dir) {
+		yaffs_add_obj_to_dir(dev->root_dir, dev->lost_n_found);
 		return YAFFS_OK;
 	}
 
 	return YAFFS_FAIL;
 }
 
-int yaffs_guts_initialise(yaffs_Device *dev)
+int yaffs_guts_initialise(yaffs_dev_t *dev)
 {
 	int init_failed = 0;
 	unsigned x;
@@ -5128,35 +5128,35 @@ int yaffs_guts_initialise(yaffs_Device *dev)
 		return YAFFS_FAIL;
 	}
 
-	dev->internalStartBlock = dev->param.startBlock;
-	dev->internalEndBlock = dev->param.endBlock;
-	dev->blockOffset = 0;
-	dev->chunkOffset = 0;
-	dev->nFreeChunks = 0;
+	dev->internal_start_block = dev->param.start_block;
+	dev->internal_end_block = dev->param.end_block;
+	dev->block_offset = 0;
+	dev->chunk_offset = 0;
+	dev->n_free_chunks = 0;
 
-	dev->gcBlock = 0;
+	dev->gc_block = 0;
 
-	if (dev->param.startBlock == 0) {
-		dev->internalStartBlock = dev->param.startBlock + 1;
-		dev->internalEndBlock = dev->param.endBlock + 1;
-		dev->blockOffset = 1;
-		dev->chunkOffset = dev->param.nChunksPerBlock;
+	if (dev->param.start_block == 0) {
+		dev->internal_start_block = dev->param.start_block + 1;
+		dev->internal_end_block = dev->param.end_block + 1;
+		dev->block_offset = 1;
+		dev->chunk_offset = dev->param.chunks_per_block;
 	}
 
 	/* Check geometry parameters. */
 
-	if ((!dev->param.inbandTags && dev->param.isYaffs2 && dev->param.totalBytesPerChunk < 1024) ||
-	    (!dev->param.isYaffs2 && dev->param.totalBytesPerChunk < 512) ||
-	    (dev->param.inbandTags && !dev->param.isYaffs2) ||
-	     dev->param.nChunksPerBlock < 2 ||
-	     dev->param.nReservedBlocks < 2 ||
-	     dev->internalStartBlock <= 0 ||
-	     dev->internalEndBlock <= 0 ||
-	     dev->internalEndBlock <= (dev->internalStartBlock + dev->param.nReservedBlocks + 2)) {	/* otherwise it is too small */
+	if ((!dev->param.inband_tags && dev->param.is_yaffs2 && dev->param.total_bytes_per_chunk < 1024) ||
+	    (!dev->param.is_yaffs2 && dev->param.total_bytes_per_chunk < 512) ||
+	    (dev->param.inband_tags && !dev->param.is_yaffs2) ||
+	     dev->param.chunks_per_block < 2 ||
+	     dev->param.n_reserved_blocks < 2 ||
+	     dev->internal_start_block <= 0 ||
+	     dev->internal_end_block <= 0 ||
+	     dev->internal_end_block <= (dev->internal_start_block + dev->param.n_reserved_blocks + 2)) {	/* otherwise it is too small */
 		T(YAFFS_TRACE_ALWAYS,
 		  (TSTR
-		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inbandTags %d "
-		    TENDSTR), dev->param.totalBytesPerChunk, dev->param.isYaffs2 ? "2" : "", dev->param.inbandTags));
+		   ("yaffs: NAND geometry problems: chunk size %d, type is yaffs%s, inband_tags %d "
+		    TENDSTR), dev->param.total_bytes_per_chunk, dev->param.is_yaffs2 ? "2" : "", dev->param.inband_tags));
 		return YAFFS_FAIL;
 	}
 
@@ -5167,10 +5167,10 @@ int yaffs_guts_initialise(yaffs_Device *dev)
 	}
 
 	/* Sort out space for inband tags, if required */
-	if (dev->param.inbandTags)
-		dev->nDataBytesPerChunk = dev->param.totalBytesPerChunk - sizeof(yaffs_PackedTags2TagsPart);
+	if (dev->param.inband_tags)
+		dev->data_bytes_per_chunk = dev->param.total_bytes_per_chunk - sizeof(yaffs_PackedTags2TagsPart);
 	else
-		dev->nDataBytesPerChunk = dev->param.totalBytesPerChunk;
+		dev->data_bytes_per_chunk = dev->param.total_bytes_per_chunk;
 
 	/* Got the right mix of functions? */
 	if (!yaffs_cehck_dev_fns(dev)) {
@@ -5189,7 +5189,7 @@ int yaffs_guts_initialise(yaffs_Device *dev)
 		return YAFFS_FAIL;
 	}
 
-	if (dev->isMounted) {
+	if (dev->is_mounted) {
 		T(YAFFS_TRACE_ALWAYS,
 		  (TSTR("yaffs: device already mounted\n" TENDSTR)));
 		return YAFFS_FAIL;
@@ -5197,62 +5197,62 @@ int yaffs_guts_initialise(yaffs_Device *dev)
 
 	/* Finished with most checks. One or two more checks happen later on too. */
 
-	dev->isMounted = 1;
+	dev->is_mounted = 1;
 
 	/* OK now calculate a few things for the device */
 
 	/*
 	 *  Calculate all the chunk size manipulation numbers:
 	 */
-	x = dev->nDataBytesPerChunk;
-	/* We always use dev->chunkShift and dev->chunkDiv */
-	dev->chunkShift = Shifts(x);
-	x >>= dev->chunkShift;
-	dev->chunkDiv = x;
-	/* We only use chunk mask if chunkDiv is 1 */
-	dev->chunkMask = (1<<dev->chunkShift) - 1;
+	x = dev->data_bytes_per_chunk;
+	/* We always use dev->chunk_shift and dev->chunk_div */
+	dev->chunk_shift = Shifts(x);
+	x >>= dev->chunk_shift;
+	dev->chunk_div = x;
+	/* We only use chunk mask if chunk_div is 1 */
+	dev->chunk_mask = (1<<dev->chunk_shift) - 1;
 
 	/*
-	 * Calculate chunkGroupBits.
-	 * We need to find the next power of 2 > than internalEndBlock
+	 * Calculate chunk_grp_bits.
+	 * We need to find the next power of 2 > than internal_end_block
 	 */
 
-	x = dev->param.nChunksPerBlock * (dev->internalEndBlock + 1);
+	x = dev->param.chunks_per_block * (dev->internal_end_block + 1);
 
 	bits = ShiftsGE(x);
 
 	/* Set up tnode width if wide tnodes are enabled. */
-	if (!dev->param.wideTnodesDisabled) {
+	if (!dev->param.wide_tnodes_disabled) {
 		/* bits must be even so that we end up with 32-bit words */
 		if (bits & 1)
 			bits++;
 		if (bits < 16)
-			dev->tnodeWidth = 16;
+			dev->tnode_width = 16;
 		else
-			dev->tnodeWidth = bits;
+			dev->tnode_width = bits;
 	} else
-		dev->tnodeWidth = 16;
+		dev->tnode_width = 16;
 
-	dev->tnodeMask = (1<<dev->tnodeWidth)-1;
+	dev->tnode_mask = (1<<dev->tnode_width)-1;
 
 	/* Level0 Tnodes are 16 bits or wider (if wide tnodes are enabled),
 	 * so if the bitwidth of the
 	 * chunk range we're using is greater than 16 we need
-	 * to figure out chunk shift and chunkGroupSize
+	 * to figure out chunk shift and chunk_grp_size
 	 */
 
-	if (bits <= dev->tnodeWidth)
-		dev->chunkGroupBits = 0;
+	if (bits <= dev->tnode_width)
+		dev->chunk_grp_bits = 0;
 	else
-		dev->chunkGroupBits = bits - dev->tnodeWidth;
+		dev->chunk_grp_bits = bits - dev->tnode_width;
 
-	dev->tnodeSize = (dev->tnodeWidth * YAFFS_NTNODES_LEVEL0)/8;
-	if(dev->tnodeSize < sizeof(yaffs_tnode_t))
-		dev->tnodeSize = sizeof(yaffs_tnode_t);
+	dev->tnode_size = (dev->tnode_width * YAFFS_NTNODES_LEVEL0)/8;
+	if(dev->tnode_size < sizeof(yaffs_tnode_t))
+		dev->tnode_size = sizeof(yaffs_tnode_t);
 
-	dev->chunkGroupSize = 1 << dev->chunkGroupBits;
+	dev->chunk_grp_size = 1 << dev->chunk_grp_bits;
 
-	if (dev->param.nChunksPerBlock < dev->chunkGroupSize) {
+	if (dev->param.chunks_per_block < dev->chunk_grp_size) {
 		/* We have a problem because the soft delete won't work if
 		 * the chunk group size > chunks per block.
 		 * This can be remedied by using larger "virtual blocks".
@@ -5266,74 +5266,74 @@ int yaffs_guts_initialise(yaffs_Device *dev)
 	/* OK, we've finished verifying the device, lets continue with initialisation */
 
 	/* More device initialisation */
-	dev->allGCs = 0;
-	dev->passiveGCs = 0;
-	dev->oldestDirtyGCs = 0;
-	dev->backgroundGCs = 0;
-	dev->gcBlockFinder = 0;
-	dev->bufferedBlock = -1;
-	dev->doingBufferedBlockRewrite = 0;
-	dev->nDeletedFiles = 0;
-	dev->nBackgroundDeletions = 0;
-	dev->nUnlinkedFiles = 0;
-	dev->eccFixed = 0;
-	dev->eccUnfixed = 0;
-	dev->tagsEccFixed = 0;
-	dev->tagsEccUnfixed = 0;
-	dev->nErasureFailures = 0;
-	dev->nErasedBlocks = 0;
-	dev->gcDisable= 0;
-	dev->hasPendingPrioritisedGCs = 1; /* Assume the worst for now, will get fixed on first GC */
-	YINIT_LIST_HEAD(&dev->dirtyDirectories);
-	dev->oldestDirtySequence = 0;
-	dev->oldestDirtyBlock = 0;
+	dev->all_gcs = 0;
+	dev->passive_gc_count = 0;
+	dev->oldest_dirty_gc_count = 0;
+	dev->bg_gcs = 0;
+	dev->gc_block_finder = 0;
+	dev->buffered_block = -1;
+	dev->doing_buffered_block_rewrite = 0;
+	dev->n_deleted_files = 0;
+	dev->n_bg_deletions = 0;
+	dev->n_unlinked_files = 0;
+	dev->n_ecc_fixed = 0;
+	dev->n_ecc_unfixed = 0;
+	dev->n_tags_ecc_fixed = 0;
+	dev->n_tags_ecc_unfixed = 0;
+	dev->n_erase_failures = 0;
+	dev->n_erased_blocks = 0;
+	dev->gc_disable= 0;
+	dev->has_pending_prioritised_gc = 1; /* Assume the worst for now, will get fixed on first GC */
+	YINIT_LIST_HEAD(&dev->dirty_dirs);
+	dev->oldest_dirty_seq = 0;
+	dev->oldest_dirty_block = 0;
 
 	/* Initialise temporary buffers and caches. */
 	if (!yaffs_init_tmp_buffers(dev))
 		init_failed = 1;
 
-	dev->srCache = NULL;
-	dev->gcCleanupList = NULL;
+	dev->cache = NULL;
+	dev->gc_cleanup_list = NULL;
 
 
 	if (!init_failed &&
-	    dev->param.nShortOpCaches > 0) {
+	    dev->param.n_caches > 0) {
 		int i;
 		void *buf;
-		int srCacheBytes = dev->param.nShortOpCaches * sizeof(yaffs_ChunkCache);
+		int cacheBytes = dev->param.n_caches * sizeof(yaffs_cache_t);
 
-		if (dev->param.nShortOpCaches > YAFFS_MAX_SHORT_OP_CACHES)
-			dev->param.nShortOpCaches = YAFFS_MAX_SHORT_OP_CACHES;
+		if (dev->param.n_caches > YAFFS_MAX_SHORT_OP_CACHES)
+			dev->param.n_caches = YAFFS_MAX_SHORT_OP_CACHES;
 
-		dev->srCache =  YMALLOC(srCacheBytes);
+		dev->cache =  YMALLOC(cacheBytes);
 
-		buf = (__u8 *) dev->srCache;
+		buf = (__u8 *) dev->cache;
 
-		if (dev->srCache)
-			memset(dev->srCache, 0, srCacheBytes);
+		if (dev->cache)
+			memset(dev->cache, 0, cacheBytes);
 
-		for (i = 0; i < dev->param.nShortOpCaches && buf; i++) {
-			dev->srCache[i].object = NULL;
-			dev->srCache[i].lastUse = 0;
-			dev->srCache[i].dirty = 0;
-			dev->srCache[i].data = buf = YMALLOC_DMA(dev->param.totalBytesPerChunk);
+		for (i = 0; i < dev->param.n_caches && buf; i++) {
+			dev->cache[i].object = NULL;
+			dev->cache[i].last_use = 0;
+			dev->cache[i].dirty = 0;
+			dev->cache[i].data = buf = YMALLOC_DMA(dev->param.total_bytes_per_chunk);
 		}
 		if (!buf)
 			init_failed = 1;
 
-		dev->srLastUse = 0;
+		dev->cache_last_use = 0;
 	}
 
-	dev->cacheHits = 0;
+	dev->cache_hits = 0;
 
 	if (!init_failed) {
-		dev->gcCleanupList = YMALLOC(dev->param.nChunksPerBlock * sizeof(__u32));
-		if (!dev->gcCleanupList)
+		dev->gc_cleanup_list = YMALLOC(dev->param.chunks_per_block * sizeof(__u32));
+		if (!dev->gc_cleanup_list)
 			init_failed = 1;
 	}
 
-	if (dev->param.isYaffs2)
-		dev->param.useHeaderFileSize = 1;
+	if (dev->param.is_yaffs2)
+		dev->param.use_header_file_size = 1;
 
 	if (!init_failed && !yaffs_init_blocks(dev))
 		init_failed = 1;
@@ -5346,9 +5346,9 @@ int yaffs_guts_initialise(yaffs_Device *dev)
 
 	if (!init_failed) {
 		/* Now scan the flash. */
-		if (dev->param.isYaffs2) {
+		if (dev->param.is_yaffs2) {
 			if (yaffs2_checkpt_restore(dev)) {
-				yaffs_check_obj_details_loaded(dev->rootDir);
+				yaffs_check_obj_details_loaded(dev->root_dir);
 				T(YAFFS_TRACE_ALWAYS,
 				  (TSTR("yaffs: restored from checkpoint" TENDSTR)));
 			} else {
@@ -5360,13 +5360,13 @@ int yaffs_guts_initialise(yaffs_Device *dev)
 
 				yaffs_deinit_tnodes_and_objs(dev);
 
-				dev->nErasedBlocks = 0;
-				dev->nFreeChunks = 0;
-				dev->allocationBlock = -1;
-				dev->allocationPage = -1;
-				dev->nDeletedFiles = 0;
-				dev->nUnlinkedFiles = 0;
-				dev->nBackgroundDeletions = 0;
+				dev->n_erased_blocks = 0;
+				dev->n_free_chunks = 0;
+				dev->alloc_block = -1;
+				dev->alloc_page = -1;
+				dev->n_deleted_files = 0;
+				dev->n_unlinked_files = 0;
+				dev->n_bg_deletions = 0;
 
 				if (!init_failed && !yaffs_init_blocks(dev))
 					init_failed = 1;
@@ -5384,7 +5384,7 @@ int yaffs_guts_initialise(yaffs_Device *dev)
 
 		yaffs_strip_deleted_objs(dev);
 		yaffs_fix_hanging_objs(dev);
-		if(dev->param.emptyLostAndFound)
+		if(dev->param.empty_lost_n_found)
 			yaffs_empty_l_n_f(dev);
 	}
 
@@ -5398,19 +5398,19 @@ int yaffs_guts_initialise(yaffs_Device *dev)
 	}
 
 	/* Zero out stats */
-	dev->nPageReads = 0;
-	dev->nPageWrites = 0;
-	dev->nBlockErasures = 0;
-	dev->nGCCopies = 0;
-	dev->nRetriedWrites = 0;
+	dev->n_page_reads = 0;
+	dev->n_page_writes = 0;
+	dev->n_erasures = 0;
+	dev->n_gc_copies = 0;
+	dev->n_retired_writes = 0;
 
-	dev->nRetiredBlocks = 0;
+	dev->n_retired_blocks = 0;
 
 	yaffs_verify_free_chunks(dev);
 	yaffs_verify_blocks(dev);
 
 	/* Clean up any aborted checkpoint data */
-	if(!dev->isCheckpointed && dev->blocksInCheckpoint > 0)
+	if(!dev->is_checkpointed && dev->blocks_in_checkpt > 0)
 		yaffs2_checkpt_invalidate(dev);
 
 	T(YAFFS_TRACE_TRACING,
@@ -5419,55 +5419,55 @@ int yaffs_guts_initialise(yaffs_Device *dev)
 
 }
 
-void yaffs_deinitialise(yaffs_Device *dev)
+void yaffs_deinitialise(yaffs_dev_t *dev)
 {
-	if (dev->isMounted) {
+	if (dev->is_mounted) {
 		int i;
 
 		yaffs_deinit_blocks(dev);
 		yaffs_deinit_tnodes_and_objs(dev);
-		if (dev->param.nShortOpCaches > 0 &&
-		    dev->srCache) {
+		if (dev->param.n_caches > 0 &&
+		    dev->cache) {
 
-			for (i = 0; i < dev->param.nShortOpCaches; i++) {
-				if (dev->srCache[i].data)
-					YFREE(dev->srCache[i].data);
-				dev->srCache[i].data = NULL;
+			for (i = 0; i < dev->param.n_caches; i++) {
+				if (dev->cache[i].data)
+					YFREE(dev->cache[i].data);
+				dev->cache[i].data = NULL;
 			}
 
-			YFREE(dev->srCache);
-			dev->srCache = NULL;
+			YFREE(dev->cache);
+			dev->cache = NULL;
 		}
 
-		YFREE(dev->gcCleanupList);
+		YFREE(dev->gc_cleanup_list);
 
 		for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++)
-			YFREE(dev->tempBuffer[i].buffer);
+			YFREE(dev->temp_buffer[i].buffer);
 
-		dev->isMounted = 0;
+		dev->is_mounted = 0;
 
-		if (dev->param.deinitialiseNAND)
-			dev->param.deinitialiseNAND(dev);
+		if (dev->param.deinitialise_flash_fn)
+			dev->param.deinitialise_flash_fn(dev);
 	}
 }
 
-int yaffs_count_free_chunks(yaffs_Device *dev)
+int yaffs_count_free_chunks(yaffs_dev_t *dev)
 {
 	int nFree=0;
 	int b;
 
-	yaffs_BlockInfo *blk;
+	yaffs_block_info_t *blk;
 
-	blk = dev->blockInfo;
-	for (b = dev->internalStartBlock; b <= dev->internalEndBlock; b++) {
-		switch (blk->blockState) {
+	blk = dev->block_info;
+	for (b = dev->internal_start_block; b <= dev->internal_end_block; b++) {
+		switch (blk->block_state) {
 		case YAFFS_BLOCK_STATE_EMPTY:
 		case YAFFS_BLOCK_STATE_ALLOCATING:
 		case YAFFS_BLOCK_STATE_COLLECTING:
 		case YAFFS_BLOCK_STATE_FULL:
 			nFree +=
-			    (dev->param.nChunksPerBlock - blk->pagesInUse +
-			     blk->softDeletions);
+			    (dev->param.chunks_per_block - blk->pages_in_use +
+			     blk->soft_del_pages);
 			break;
 		default:
 			break;
@@ -5478,7 +5478,7 @@ int yaffs_count_free_chunks(yaffs_Device *dev)
 	return nFree;
 }
 
-int yaffs_get_n_free_chunks(yaffs_Device *dev)
+int yaffs_get_n_free_chunks(yaffs_dev_t *dev)
 {
 	/* This is what we report to the outside world */
 
@@ -5488,28 +5488,28 @@ int yaffs_get_n_free_chunks(yaffs_Device *dev)
 	int i;
 
 #if 1
-	nFree = dev->nFreeChunks;
+	nFree = dev->n_free_chunks;
 #else
 	nFree = yaffs_count_free_chunks(dev);
 #endif
 
-	nFree += dev->nDeletedFiles;
+	nFree += dev->n_deleted_files;
 
 	/* Now count the number of dirty chunks in the cache and subtract those */
 
-	for (nDirtyCacheChunks = 0, i = 0; i < dev->param.nShortOpCaches; i++) {
-		if (dev->srCache[i].dirty)
+	for (nDirtyCacheChunks = 0, i = 0; i < dev->param.n_caches; i++) {
+		if (dev->cache[i].dirty)
 			nDirtyCacheChunks++;
 	}
 
 	nFree -= nDirtyCacheChunks;
 
-	nFree -= ((dev->param.nReservedBlocks + 1) * dev->param.nChunksPerBlock);
+	nFree -= ((dev->param.n_reserved_blocks + 1) * dev->param.chunks_per_block);
 
 	/* Now we figure out how much to reserve for the checkpoint and report that... */
 	blocksForCheckpoint = yaffs_calc_checkpt_blocks_required(dev);
 
-	nFree -= (blocksForCheckpoint * dev->param.nChunksPerBlock);
+	nFree -= (blocksForCheckpoint * dev->param.chunks_per_block);
 
 	if (nFree < 0)
 		nFree = 0;
@@ -5532,13 +5532,13 @@ int yaffs_get_n_free_chunks(yaffs_Device *dev)
 
 static int yaffs_check_structures(void)
 {
-/*      yaffs_check_struct(yaffs_Tags,8,"yaffs_Tags"); */
+/*      yaffs_check_struct(yaffs_tags_t,8,"yaffs_tags_t"); */
 /*      yaffs_check_struct(yaffs_tags_union_t,8,"yaffs_tags_union_t"); */
-/*      yaffs_check_struct(yaffs_Spare,16,"yaffs_Spare"); */
+/*      yaffs_check_struct(yaffs_spare,16,"yaffs_spare"); */
 /*	yaffs_check_struct(yaffs_tnode_t, 2 * YAFFS_NTNODES_LEVEL0, "yaffs_tnode_t"); */
 
 #ifndef CONFIG_YAFFS_WINCE
-	yaffs_check_struct(yaffs_ObjectHeader, 512, "yaffs_ObjectHeader");
+	yaffs_check_struct(yaffs_obj_header, 512, "yaffs_obj_header");
 #endif
 	return YAFFS_OK;
 }