diff --git a/headers/private/storage/DiskDeviceTypes.h b/headers/private/storage/DiskDeviceTypes.h
index fb5987627c..adb9e5f67b 100644
--- a/headers/private/storage/DiskDeviceTypes.h
+++ b/headers/private/storage/DiskDeviceTypes.h
@@ -1,15 +1,10 @@
-//----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//---------------------------------------------------------------------
-
+/*
+ * Copyright 2003-2007, Haiku Inc.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _DISK_DEVICE_TYPES_H
 #define _DISK_DEVICE_TYPES_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 // Device Types
 
 extern const char *kDeviceTypeFloppyDisk;
@@ -27,6 +22,7 @@ extern const char *kPartitionTypeDataSession;
 
 extern const char *kPartitionTypeAmiga;
 extern const char *kPartitionTypeApple;
+extern const char *kPartitionTypeEFI;
 extern const char *kPartitionTypeIntel;
 
 extern const char *kPartitionTypeIntelPrimary;
@@ -45,8 +41,4 @@ extern const char *kPartitionTypeISO9660;
 extern const char *kPartitionTypeReiser;
 extern const char *kPartitionTypeUDF;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif // _DISK_DEVICE_TYPES_H
diff --git a/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp b/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp
index da5f0481e6..f2a1460382 100644
--- a/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp
+++ b/src/add-ons/kernel/partitioning_systems/efi/efi_gpt.cpp
@@ -29,7 +29,7 @@
 
 
 #define EFI_PARTITION_MODULE_NAME "partitioning_systems/efi_gpt/v1"
-#define EFI_PARTITION_NAME "EFI GUID Partition Table"
+#define EFI_PARTITION_NAME "EFI GUID Partition Map"
 
 
 struct static_guid {
diff --git a/src/kits/storage/DiskDeviceTypes.cpp b/src/kits/storage/DiskDeviceTypes.cpp
index b58027bf65..9586c5cbb8 100644
--- a/src/kits/storage/DiskDeviceTypes.cpp
+++ b/src/kits/storage/DiskDeviceTypes.cpp
@@ -1,10 +1,15 @@
-//----------------------------------------------------------------------
-//  This software is part of the Haiku distribution and is covered 
-//  by the MIT license.
-//---------------------------------------------------------------------
+/*
+ * Copyright 2003-2007, Haiku Inc.
+ * Distributed under the terms of the MIT License.
+ *
+ * Authors:
+ *		Tyler Akidau
+ */
+
 
 #include <DiskDeviceTypes.h>
 
+
 // Device Types
 
 const char *kDeviceTypeFloppyDisk	= "Floppy Disk Media";
@@ -22,6 +27,7 @@ const char *kPartitionTypeDataSession	= "Data Session";
 
 const char *kPartitionTypeAmiga			= "Amiga Partition Map";
 const char *kPartitionTypeApple			= "Apple Partition Map";
+const char *kPartitionTypeEFI			= "EFI GUID Partition Map";
 const char *kPartitionTypeIntel			= "Intel Partition Map";
 
 const char *kPartitionTypeIntelPrimary	= "Intel Primary Partition";