diff --git a/src/add-ons/disk_systems/intel/Jamfile b/src/add-ons/disk_systems/intel/Jamfile
index db47924aba..182225ce87 100644
--- a/src/add-ons/disk_systems/intel/Jamfile
+++ b/src/add-ons/disk_systems/intel/Jamfile
@@ -18,7 +18,7 @@ Addon <disk_system>intel :
 	IntelDiskSystem.cpp
 	ExtendedPartitionAddOn.cpp
 	PartitionMapAddOn.cpp
-	CreationParameterEditor.cpp
+	PrimaryParameterEditor.cpp
 
 	# kernel sources
 	PartitionMap.cpp
@@ -29,5 +29,5 @@ Addon <disk_system>intel :
 DoCatalogs <disk_system>intel :
 	x-vnd.Haiku-IntelDiskAddOn
 	:
-	CreationParameterEditor.cpp
+	PrimaryParameterEditor.cpp
 ;
diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
index 1da8e2a9a5..d9c1450048 100644
--- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
+++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp
@@ -4,7 +4,6 @@
  */
 
 
-#include "CreationParameterEditor.h"
 #include "PartitionMapAddOn.h"
 
 #include <new>
@@ -17,6 +16,7 @@
 #include <AutoDeleter.h>
 
 #include "IntelDiskSystem.h"
+#include "PrimaryParameterEditor.h"
 
 
 //#define TRACE_PARTITION_MAP_ADD_ON
diff --git a/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp
similarity index 97%
rename from src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
rename to src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp
index 75c3819b9e..0d89a9cfbf 100644
--- a/src/add-ons/disk_systems/intel/CreationParameterEditor.cpp
+++ b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.cpp
@@ -5,7 +5,7 @@
  */
 
 
-#include "CreationParameterEditor.h"
+#include "PrimaryParameterEditor.h"
 
 #include <Catalog.h>
 #include <DiskDeviceTypes.h>
diff --git a/src/add-ons/disk_systems/intel/CreationParameterEditor.h b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.h
similarity index 86%
rename from src/add-ons/disk_systems/intel/CreationParameterEditor.h
rename to src/add-ons/disk_systems/intel/PrimaryParameterEditor.h
index e165560668..fad1f1caed 100644
--- a/src/add-ons/disk_systems/intel/CreationParameterEditor.h
+++ b/src/add-ons/disk_systems/intel/PrimaryParameterEditor.h
@@ -3,8 +3,8 @@
  * Copyright 2009, Bryce Groff, brycegroff@gmail.com.
  * Distributed under the terms of the MIT License.
  */
-#ifndef _CREATION_PARAMETER_EDITOR
-#define _CREATION_PARAMETER_EDITOR
+#ifndef _PRIMARY_PARAMETER_EDITOR
+#define _PRIMARY_PARAMETER_EDITOR
 
 
 #include <PartitionParameterEditor.h>
@@ -32,4 +32,4 @@ private:
 };
 
 
-#endif // _CREATION_PARAMETER_EDITOR
+#endif // _PRIMARY_PARAMETER_EDITOR