diff --git a/src/add-ons/kernel/file_systems/iso9660/iso9660.c b/src/add-ons/kernel/file_systems/iso9660/iso9660.c
index dba53af24f..3458c4c438 100644
--- a/src/add-ons/kernel/file_systems/iso9660/iso9660.c
+++ b/src/add-ons/kernel/file_systems/iso9660/iso9660.c
@@ -6,7 +6,7 @@
  */
 
 
-#include "iso.h"
+#include "iso9660.h"
 
 #include <ByteOrder.h>
 #include <Drivers.h>
diff --git a/src/add-ons/kernel/file_systems/iso9660/iso.h b/src/add-ons/kernel/file_systems/iso9660/iso9660.h
similarity index 95%
rename from src/add-ons/kernel/file_systems/iso9660/iso.h
rename to src/add-ons/kernel/file_systems/iso9660/iso9660.h
index d06cfb22e1..c6bcc9ecde 100644
--- a/src/add-ons/kernel/file_systems/iso9660/iso.h
+++ b/src/add-ons/kernel/file_systems/iso9660/iso9660.h
@@ -4,8 +4,8 @@
  *
  * Copyright 2001, pinc Software.  All Rights Reserved.
  */
-#ifndef _ISO_H
-#define _ISO_H
+#ifndef ISO_9660_H
+#define ISO_9660_H
 
 
 #include "lock.h"
@@ -224,13 +224,15 @@ typedef struct nspace {
 extern "C" {
 #endif
 
-int 		ISOMount(const char *path, const int flags, nspace** newVol, bool allow_joliet);
-int			ISOReadDirEnt(nspace* ns, dircookie* cookie, struct dirent* buf, size_t bufsize);
-int			InitNode(vnode* rec, char* buf, int* bytesRead, uint8 joliet_level);
-int			ConvertRecDate(ISORecDate* inDate, time_t* outDate);
+int ISOMount(const char *path, const int flags, nspace** newVolume,
+	bool allowJoliet);
+int	ISOReadDirEnt(nspace* ns, dircookie* cookie, struct dirent* buffer,
+	size_t bufferSize);
+int	InitNode(vnode* rec, char* buf, int* bytesRead, uint8 jolietLevel);
+int	ConvertRecDate(ISORecDate* inDate, time_t* outDate);
 
 #ifdef __cplusplus
 }
 #endif 
 
-#endif	/* _ISO_H */
+#endif	/* ISO_9660_H */
diff --git a/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp b/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp
index 52ca369792..1452db2317 100644
--- a/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/iso9660/kernel_interface.cpp
@@ -32,7 +32,7 @@
 
 #include <util/kernel_cpp.h>
 
-#include "iso.h"
+#include "iso9660.h"
 #include "iso9660_identify.h"