diff --git a/headers/os/storage/DiskScannerAddOn.h b/headers/os/storage/DiskScannerAddOn.h
index a6904f6a7b..986d590e0f 100644
--- a/headers/os/storage/DiskScannerAddOn.h
+++ b/headers/os/storage/DiskScannerAddOn.h
@@ -21,7 +21,6 @@ public:
 
 	virtual const char *ShortName() = 0;
 	virtual const char *LongName() = 0;
-	virtual const char *Identifier() = 0;
 
 	virtual BDiskScannerParameterEditor *CreateEditor(
 		const session_info *sessionInfo, const char *parameters) = 0;
@@ -44,7 +43,6 @@ public:
 
 	virtual const char *ShortName() = 0;
 	virtual const char *LongName() = 0;
-	virtual const char *FileSystem() = 0;
 
 	virtual BDiskScannerParameterEditor *CreateEditor(
 		const partition_info *partitionInfo, const char *parameters) = 0;
diff --git a/src/kits/storage/DiskScannerAddOn.cpp b/src/kits/storage/DiskScannerAddOn.cpp
index 5c443fc804..f4c7b6de81 100644
--- a/src/kits/storage/DiskScannerAddOn.cpp
+++ b/src/kits/storage/DiskScannerAddOn.cpp
@@ -23,10 +23,13 @@ BDiskScannerPartitionAddOn::~BDiskScannerPartitionAddOn()
 }
 
 /*!	\fn virtual const char *BDiskScannerPartitionAddOn::ShortName() = 0;
-	\brief Returns a user-readable short name for the add-on.
+	\brief Returns a short name for the add-on.
 
 	To be implemented by derived classes.
 
+	The returned string identifies the respective partition kernel module is
+	passed to partition_session().
+
 	\return A short name for the add-on.
 */
 
@@ -38,16 +41,6 @@ BDiskScannerPartitionAddOn::~BDiskScannerPartitionAddOn()
 	\return A long name for the add-on.
 */
 
-/*!	\fn virtual const char *BDiskScannerPartitionAddOn::Identifier() = 0;
-	\brief Returns a string identifying the respective kernel module.
-
-	To be implemented by derived classes.
-
-	The returned identifier is passed to partition_session().
-
-	\return A string identifying the respective kernel module.
-*/
-
 /*!	\fn virtual BDiskScannerPartitionAddOn::BDiskScannerParameterEditor *
 		CreateEditor(const session_info *sessionInfo,
 					  const char *parameters) = 0;
@@ -87,10 +80,13 @@ BDiskScannerFSAddOn::~BDiskScannerFSAddOn()
 }
 
 /*!	\fn virtual const char *BDiskScannerFSAddOn::ShortName() = 0;
-	\brief Returns a user-readable short name for the add-on.
+	\brief Returns a short name for the add-on.
 
 	To be implemented by derived classes.
 
+	The returned name identifies the file system (the kernel add-on) and is
+	passed to initialize_volume().
+
 	\return A short name for the add-on.
 */
 
@@ -102,16 +98,6 @@ BDiskScannerFSAddOn::~BDiskScannerFSAddOn()
 	\return A long name for the add-on.
 */
 
-/*!	\fn virtual const char *BDiskScannerFSAddOn::FileSystem() = 0;
-	\brief Returns a string identifying the respective kernel FS add-on.
-
-	To be implemented by derived classes.
-
-	The returned name is passed to initialize_volume().
-
-	\return A string identifying the respective kernel add-on.
-*/
-
 /*!	\fn virtual BDiskScannerFSAddOn::BDiskScannerParameterEditor *CreateEditor(
 		const partition_info *partitionInfo, const char *parameters) = 0;
 	\brief Creates and returns an editor for editing initialization parameters