diff --git a/Minecraft.World/IO/Files/ConsoleSaveFile.h b/Minecraft.World/IO/Files/ConsoleSaveFile.h
index 6acfb3bd5..f24386aa4 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFile.h
+++ b/Minecraft.World/IO/Files/ConsoleSaveFile.h
@@ -11,9 +11,9 @@ public:
 	virtual FileEntry *createFile( const ConsoleSavePath &fileName ) = 0;
 	virtual void deleteFile( FileEntry *file ) = 0;
 	virtual void setFilePointer( FileEntry *file,LONG lDistanceToMove, PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod) = 0;
-	virtual BOOL writeFile(	FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) = 0;
-	virtual BOOL zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) = 0;
-	virtual BOOL readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead ) = 0;
+	virtual bool writeFile(	FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) = 0;
+	virtual bool zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten) = 0;
+	virtual bool readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead ) = 0;
 	virtual bool closeHandle( FileEntry *file ) = 0;
 	virtual void finalizeWrite() = 0;
 	virtual void tick() {};
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileInputStream.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileInputStream.cpp
index 9118dbf4a..b97622d80 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileInputStream.cpp
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileInputStream.cpp
@@ -28,14 +28,14 @@ int ConsoleSaveFileInputStream::read()
 	uint8_t byteRead = static_cast<uint8_t>(0);
 	unsigned int numberOfBytesRead;
 
-	BOOL result = m_saveFile->readFile(
+	bool result = m_saveFile->readFile(
 		m_file,
 		&byteRead, // data buffer
 		1, // number of bytes to read
 		&numberOfBytesRead // number of bytes read
 		);
 
-	if( result == 0 )
+	if( !result )
 	{
 		// TODO 4J Stu - Some kind of error handling
 		return -1;
@@ -58,14 +58,14 @@ int ConsoleSaveFileInputStream::read(byteArray b)
 {
 	unsigned int numberOfBytesRead;
 
-	BOOL result = m_saveFile->readFile(
+	bool result = m_saveFile->readFile(
 		m_file,
 		&b.data, // data buffer
 		b.length, // number of bytes to read
 		&numberOfBytesRead // number of bytes read
 		);
 
-	if( result == 0 )
+	if( !result )
 	{
 		// TODO 4J Stu - Some kind of error handling
 		return -1;
@@ -94,14 +94,14 @@ int ConsoleSaveFileInputStream::read(byteArray b, unsigned int offset, unsigned
 
 	unsigned int numberOfBytesRead;
 
-	BOOL result = m_saveFile->readFile(
+	bool result = m_saveFile->readFile(
 		m_file,
 		&b[offset], // data buffer
 		length, // number of bytes to read
 		&numberOfBytesRead // number of bytes read
 		);
 
-	if( result == 0 )
+	if( !result )
 	{
 		// TODO 4J Stu - Some kind of error handling
 		return -1;
@@ -123,7 +123,7 @@ void ConsoleSaveFileInputStream::close()
 	{
 		bool result = m_saveFile->closeHandle( m_file );
 
-		if( result == 0 )
+		if( !result )
 		{
 			// TODO 4J Stu - Some kind of error handling
 		}
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
index 0356b753d..f0fe0c0df 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.cpp
@@ -337,12 +337,12 @@ void ConsoleSaveFileOriginal::PrepareForWrite( FileEntry *file, unsigned int nNu
 	finalizeWrite();
 }
 
-BOOL ConsoleSaveFileOriginal::writeFile(FileEntry *file,const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
+bool ConsoleSaveFileOriginal::writeFile(FileEntry *file,const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
 {
 	assert( pvSaveMem != NULL );
 	if( pvSaveMem == NULL )
 	{
-		return 0;
+		return false;
 	}
 
 	LockSaveAccess();
@@ -371,15 +371,15 @@ BOOL ConsoleSaveFileOriginal::writeFile(FileEntry *file,const void *lpBuffer, un
 
 	ReleaseSaveAccess();
 
-	return 1;
+	return true;
 }
 
-BOOL ConsoleSaveFileOriginal::zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
+bool ConsoleSaveFileOriginal::zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
 {
 	assert( pvSaveMem != NULL );
 	if( pvSaveMem == NULL )
 	{
-		return 0;
+		return false;
 	}
 
 	LockSaveAccess();
@@ -408,16 +408,16 @@ BOOL ConsoleSaveFileOriginal::zeroFile(FileEntry *file, unsigned int nNumberOfBy
 
 	ReleaseSaveAccess();
 
-	return 1;
+	return true;
 }
 
-BOOL ConsoleSaveFileOriginal::readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead)
+bool ConsoleSaveFileOriginal::readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead)
 {
 	unsigned int actualBytesToRead;
 	assert( pvSaveMem != NULL );
 	if( pvSaveMem == NULL )
 	{
-		return 0;
+		return false;
 	}
 
 	LockSaveAccess();
@@ -448,7 +448,7 @@ BOOL ConsoleSaveFileOriginal::readFile( FileEntry *file, void *lpBuffer, unsigne
 
 	ReleaseSaveAccess();
 
-	return 1;
+	return true;
 }
 
 bool ConsoleSaveFileOriginal::closeHandle( FileEntry *file )
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h
index e613b15d7..ce2944415 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileOriginal.h
@@ -44,9 +44,9 @@ public:
 	virtual void deleteFile( FileEntry *file );
 
 	virtual void setFilePointer(FileEntry *file,LONG lDistanceToMove,PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod);
-	virtual BOOL writeFile(	FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten );
-	virtual BOOL zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten);
-	virtual BOOL readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead );
+	virtual bool writeFile(	FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten );
+	virtual bool zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten);
+	virtual bool readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead );
 	virtual bool closeHandle( FileEntry *file );
 
 	virtual void finalizeWrite();
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileOutputStream.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileOutputStream.cpp
index 210f1e988..bef7948af 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileOutputStream.cpp
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileOutputStream.cpp
@@ -40,14 +40,14 @@ void ConsoleSaveFileOutputStream::write(unsigned int b)
 
 	uint8_t value = (uint8_t) b;
 
-	BOOL result = m_saveFile->writeFile(
+	bool result = m_saveFile->writeFile(
 		m_file,
 		&value, // data buffer
 		1, // number of bytes to write
 		&numberOfBytesWritten // number of bytes written
 		);
 
-	if( result == 0 )
+	if( !result )
 	{
 		// TODO 4J Stu - Some kind of error handling
 	}
@@ -64,14 +64,14 @@ void ConsoleSaveFileOutputStream::write(byteArray b)
 {
 	unsigned int numberOfBytesWritten;
 
-	BOOL result = m_saveFile->writeFile(
+	bool result = m_saveFile->writeFile(
 		m_file,
 		&b.data, // data buffer
 		b.length, // number of bytes to write
 		&numberOfBytesWritten // number of bytes written
 		);
 
-	if( result == 0 )
+	if( !result )
 	{
 		// TODO 4J Stu - Some kind of error handling
 	}
@@ -93,14 +93,14 @@ void ConsoleSaveFileOutputStream::write(byteArray b, unsigned int offset, unsign
 
 	unsigned int numberOfBytesWritten;
 
-	BOOL result = m_saveFile->writeFile(
+	bool result = m_saveFile->writeFile(
 		m_file,
 		&b[offset], // data buffer
 		length, // number of bytes to write
 		&numberOfBytesWritten // number of bytes written
 		);
 
-	if( result == 0 )
+	if( !result )
 	{
 		// TODO 4J Stu - Some kind of error handling
 	}
@@ -119,7 +119,7 @@ void ConsoleSaveFileOutputStream::close()
 	{
 		bool result = m_saveFile->closeHandle( m_file );
 
-		if( result == 0 )
+		if( !result )
 		{
 			// TODO 4J Stu - Some kind of error handling
 		}
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
index 8a34658b7..375063e1a 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.cpp
@@ -734,12 +734,12 @@ void ConsoleSaveFileSplit::PrepareForWrite( FileEntry *file, unsigned int nNumbe
 	finalizeWrite();
 }
 
-BOOL ConsoleSaveFileSplit::writeFile(FileEntry *file,const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
+bool ConsoleSaveFileSplit::writeFile(FileEntry *file,const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
 {
 	assert( pvSaveMem != NULL );
 	if( pvSaveMem == NULL )
 	{
-		return 0;
+		return false;
 	}
 
 	LockSaveAccess();
@@ -784,15 +784,15 @@ BOOL ConsoleSaveFileSplit::writeFile(FileEntry *file,const void *lpBuffer, unsig
 
 	ReleaseSaveAccess();
 
-	return 1;
+	return true;
 }
 
-BOOL ConsoleSaveFileSplit::zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
+bool ConsoleSaveFileSplit::zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten)
 {
 	assert( pvSaveMem != NULL );
 	if( pvSaveMem == NULL )
 	{
-		return 0;
+		return false;
 	}
 
 	LockSaveAccess();
@@ -837,16 +837,16 @@ BOOL ConsoleSaveFileSplit::zeroFile(FileEntry *file, unsigned int nNumberOfBytes
 
 	ReleaseSaveAccess();
 
-	return 1;
+	return true;
 }
 
-BOOL ConsoleSaveFileSplit::readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead)
+bool ConsoleSaveFileSplit::readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead)
 {
 	unsigned int actualBytesToRead;
 	assert( pvSaveMem != NULL );
 	if( pvSaveMem == NULL )
 	{
-		return 0;
+		return false;
 	}
 
 	LockSaveAccess();
@@ -889,7 +889,7 @@ BOOL ConsoleSaveFileSplit::readFile( FileEntry *file, void *lpBuffer, unsigned i
 
 	ReleaseSaveAccess();
 
-	return 1;
+	return true;
 }
 
 bool ConsoleSaveFileSplit::closeHandle( FileEntry *file )
diff --git a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h
index 52ac39d56..21149c76f 100644
--- a/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h
+++ b/Minecraft.World/IO/Files/ConsoleSaveFileSplit.h
@@ -96,9 +96,9 @@ public:
 	virtual void deleteFile( FileEntry *file );
 
 	virtual void setFilePointer(FileEntry *file,LONG lDistanceToMove,PLONG lpDistanceToMoveHigh,DWORD dwMoveMethod);
-	virtual BOOL writeFile(	FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten );
-	virtual BOOL zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten);
-	virtual BOOL readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead );
+	virtual bool writeFile(	FileEntry *file, const void *lpBuffer, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten );
+	virtual bool zeroFile(FileEntry *file, unsigned int nNumberOfBytesToWrite, unsigned int *lpNumberOfBytesWritten);
+	virtual bool readFile( FileEntry *file, void *lpBuffer, unsigned int nNumberOfBytesToRead, unsigned int *lpNumberOfBytesRead );
 	virtual bool closeHandle( FileEntry *file );
 
 	virtual void finalizeWrite();