diff --git a/src/apps/drivesetup/CreateParamsPanel.cpp b/src/apps/drivesetup/CreateParametersPanel.cpp
similarity index 99%
rename from src/apps/drivesetup/CreateParamsPanel.cpp
rename to src/apps/drivesetup/CreateParametersPanel.cpp
index 42abf27031..f85713d7ec 100644
--- a/src/apps/drivesetup/CreateParamsPanel.cpp
+++ b/src/apps/drivesetup/CreateParametersPanel.cpp
@@ -10,7 +10,7 @@
  */
 
 
-#include "CreateParamsPanel.h"
+#include "CreateParametersPanel.h"
 
 #include <Button.h>
 #include <Catalog.h>
diff --git a/src/apps/drivesetup/CreateParamsPanel.h b/src/apps/drivesetup/CreateParametersPanel.h
similarity index 100%
rename from src/apps/drivesetup/CreateParamsPanel.h
rename to src/apps/drivesetup/CreateParametersPanel.h
diff --git a/src/apps/drivesetup/InitParamsPanel.cpp b/src/apps/drivesetup/InitParametersPanel.cpp
similarity index 97%
rename from src/apps/drivesetup/InitParamsPanel.cpp
rename to src/apps/drivesetup/InitParametersPanel.cpp
index 9c8ae569b3..c047bb27e2 100644
--- a/src/apps/drivesetup/InitParamsPanel.cpp
+++ b/src/apps/drivesetup/InitParametersPanel.cpp
@@ -9,7 +9,7 @@
  */
 
 
-#include "InitParamsPanel.h"
+#include "InitParametersPanel.h"
 
 #include <driver_settings.h>
 #include <stdio.h>
diff --git a/src/apps/drivesetup/InitParamsPanel.h b/src/apps/drivesetup/InitParametersPanel.h
similarity index 100%
rename from src/apps/drivesetup/InitParamsPanel.h
rename to src/apps/drivesetup/InitParametersPanel.h
diff --git a/src/apps/drivesetup/Jamfile b/src/apps/drivesetup/Jamfile
index 44a4a68536..b288480126 100644
--- a/src/apps/drivesetup/Jamfile
+++ b/src/apps/drivesetup/Jamfile
@@ -6,10 +6,10 @@ UsePrivateHeaders interface shared storage tracker ;
 
 Preference DriveSetup :
 	AbstractParametersPanel.cpp
-	CreateParamsPanel.cpp
+	CreateParametersPanel.cpp
 	DiskView.cpp
 	DriveSetup.cpp
-	InitParamsPanel.cpp
+	InitParametersPanel.cpp
 	MainWindow.cpp
 	PartitionList.cpp
 	Support.cpp
@@ -22,9 +22,10 @@ Preference DriveSetup :
 DoCatalogs DriveSetup :
 	x-vnd.Haiku-DriveSetup
 	:
-	CreateParamsPanel.cpp
+	AbstractParametersPanel.cpp
+	CreateParametersPanel.cpp
 	DiskView.cpp
-	InitParamsPanel.cpp
+	InitParametersPanel.cpp
 	MainWindow.cpp
 	PartitionList.cpp
 	Support.cpp
diff --git a/src/apps/drivesetup/MainWindow.cpp b/src/apps/drivesetup/MainWindow.cpp
index 2816b06ae4..6376e88bc1 100644
--- a/src/apps/drivesetup/MainWindow.cpp
+++ b/src/apps/drivesetup/MainWindow.cpp
@@ -38,12 +38,13 @@
 #include <Volume.h>
 #include <VolumeRoster.h>
 
-#include "CreateParamsPanel.h"
+#include <tracker_private.h>
+
+#include "CreateParametersPanel.h"
 #include "DiskView.h"
-#include "InitParamsPanel.h"
+#include "InitParametersPanel.h"
 #include "PartitionList.h"
 #include "Support.h"
-#include "tracker_private.h"
 
 
 #undef B_TRANSLATION_CONTEXT