diff --git a/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp b/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp
index fc5cb132a1..49099c6c3a 100644
--- a/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/RPCServer.cpp
@@ -200,7 +200,7 @@ Server::WakeCall(Request* request)
 	if (req == NULL)
 		return B_OK;
 
-	request->fError = B_FILE_ERROR;
+	request->fError = B_IO_ERROR;
 	*request->fReply = NULL;
 	request->fDone = true;
 	request->fEvent.NotifyAll();
diff --git a/src/add-ons/kernel/file_systems/ntfs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/ntfs/kernel_interface.cpp
index 664d08b635..c34c277489 100644
--- a/src/add-ons/kernel/file_systems/ntfs/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/ntfs/kernel_interface.cpp
@@ -481,7 +481,7 @@ fs_read_pages(fs_volume* _volume, fs_vnode* _node, void* _cookie,
 
 	ntfs_inode* ni = ntfs_inode_open(volume->ntfs, node->inode);
 	if (ni == NULL)
-		return B_FILE_ERROR;
+		return B_IO_ERROR;
 	NtfsInodeCloser niCloser(ni);
 
 	if (pos < 0 || pos >= ni->data_size)
@@ -521,7 +521,7 @@ fs_write_pages(fs_volume* _volume, fs_vnode* _node, void* _cookie,
 
 	ntfs_inode* ni = ntfs_inode_open(volume->ntfs, node->inode);
 	if (ni == NULL)
-		return B_FILE_ERROR;
+		return B_IO_ERROR;
 	NtfsInodeCloser niCloser(ni);
 
 	if (pos < 0 || pos >= ni->data_size)
@@ -643,7 +643,7 @@ fs_write_stat(fs_volume* _volume, fs_vnode* _node, const struct stat* stat, uint
 
 	ntfs_inode* ni = ntfs_inode_open(volume->ntfs, node->inode);
 	if (ni == NULL)
-		return B_FILE_ERROR;
+		return B_IO_ERROR;
 	NtfsInodeCloser niCloser(ni);
 
 	bool updateTime = false;
diff --git a/src/add-ons/kernel/partitioning_systems/session/Disc.cpp b/src/add-ons/kernel/partitioning_systems/session/Disc.cpp
index fb102e3f05..a216464857 100644
--- a/src/add-ons/kernel/partitioning_systems/session/Disc.cpp
+++ b/src/add-ons/kernel/partitioning_systems/session/Disc.cpp
@@ -284,7 +284,7 @@ read_table_of_contents(int deviceFD, uint32 first_session, uchar* buffer,
 				DBG(dump_full_table_of_contents(buffer, buffer_length));
 				return B_OK;
 			} else {
-				error = B_FILE_ERROR;
+				error = B_IO_ERROR;
 				TRACE(("%s: scsi ioctl succeeded, but scsi command failed\n",
 					kModuleDebugName));
 			}
diff --git a/src/add-ons/media/media-add-ons/reader/MediaReader.cpp b/src/add-ons/media/media-add-ons/reader/MediaReader.cpp
index de2631b0d3..412dc9c84f 100644
--- a/src/add-ons/media/media-add-ons/reader/MediaReader.cpp
+++ b/src/add-ons/media/media-add-ons/reader/MediaReader.cpp
@@ -792,8 +792,8 @@ status_t MediaReader::FillFileBuffer(
 	off_t position = GetCurrentFile()->Position();
 	ssize_t bytesRead = GetCurrentFile()->Read(buffer->Data(),buffer->SizeAvailable());
 	if (bytesRead < 0) {
-		PRINT("\t<- B_FILE_ERROR\n");
-		return B_FILE_ERROR; // some sort of file related error
+		PRINT("\t<- B_IO_ERROR\n");
+		return B_IO_ERROR; // some sort of I/O related error
 	}
 	PRINT("\t%ld file bytes read at position %ld.\n",
 			bytesRead, position);
diff --git a/src/add-ons/media/media-add-ons/writer/MediaWriter.cpp b/src/add-ons/media/media-add-ons/writer/MediaWriter.cpp
index 87d3797796..b5acc6ae97 100644
--- a/src/add-ons/media/media-add-ons/writer/MediaWriter.cpp
+++ b/src/add-ons/media/media-add-ons/writer/MediaWriter.cpp
@@ -546,8 +546,8 @@ status_t MediaWriter::WriteFileBuffer(
 			buffer->SizeUsed(),GetCurrentFile()->Position());
 	ssize_t bytesWriten = GetCurrentFile()->Write(buffer->Data(),buffer->SizeUsed());
 	if (bytesWriten < 0) {
-		fprintf(stderr,"<- B_FILE_ERROR\n");
-		return B_FILE_ERROR; // some sort of file related error
+		fprintf(stderr,"<- B_IO_ERROR\n");
+		return B_IO_ERROR; // some sort of I/O related error
 	}
 	// nothing more to say?
 	return B_OK;