diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index f387f95c9d..0df0585b72 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -105,7 +105,7 @@ AddFilesToPackage add-ons kernel power cpufreq :
 	intel_pstates@x86,x86_64
 	;
 AddFilesToPackage add-ons kernel power cpuidle :
-	intel_cstates@x86,x86_64
+	x86_cstates@x86,x86_64
 	;
 
 if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap
index bdaa209d24..882b860304 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -67,7 +67,7 @@ AddFilesToPackage add-ons kernel power cpufreq :
 	intel_pstates@x86,x86_64
 	;
 AddFilesToPackage add-ons kernel power cpuidle :
-	intel_cstates@x86,x86_64
+	x86_cstates@x86,x86_64
 	;
 
 if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
diff --git a/src/add-ons/kernel/power/cpuidle/Jamfile b/src/add-ons/kernel/power/cpuidle/Jamfile
index 702f538988..005ef9009c 100644
--- a/src/add-ons/kernel/power/cpuidle/Jamfile
+++ b/src/add-ons/kernel/power/cpuidle/Jamfile
@@ -1,4 +1,4 @@
 SubDir HAIKU_TOP src add-ons kernel power cpuidle ;
 
-SubInclude HAIKU_TOP src add-ons kernel power cpuidle intel_cstates ;
+SubInclude HAIKU_TOP src add-ons kernel power cpuidle x86_cstates ;
 
diff --git a/src/add-ons/kernel/power/cpuidle/intel_cstates/Jamfile b/src/add-ons/kernel/power/cpuidle/intel_cstates/Jamfile
deleted file mode 100644
index 4c8ee487d7..0000000000
--- a/src/add-ons/kernel/power/cpuidle/intel_cstates/Jamfile
+++ /dev/null
@@ -1,8 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel power cpuidle intel_cstates ;
-
-UsePrivateKernelHeaders ;
-
-KernelAddon intel_cstates :
-	intel_cstates.cpp
-	;
-
diff --git a/src/add-ons/kernel/power/cpuidle/x86_cstates/Jamfile b/src/add-ons/kernel/power/cpuidle/x86_cstates/Jamfile
new file mode 100644
index 0000000000..6d9ff21165
--- /dev/null
+++ b/src/add-ons/kernel/power/cpuidle/x86_cstates/Jamfile
@@ -0,0 +1,8 @@
+SubDir HAIKU_TOP src add-ons kernel power cpuidle x86_cstates ;
+
+UsePrivateKernelHeaders ;
+
+KernelAddon x86_cstates :
+	x86_cstates.cpp
+	;
+
diff --git a/src/add-ons/kernel/power/cpuidle/intel_cstates/intel_cstates.cpp b/src/add-ons/kernel/power/cpuidle/x86_cstates/x86_cstates.cpp
similarity index 96%
rename from src/add-ons/kernel/power/cpuidle/intel_cstates/intel_cstates.cpp
rename to src/add-ons/kernel/power/cpuidle/x86_cstates/x86_cstates.cpp
index f3ddadeabe..cc0dfa0380 100644
--- a/src/add-ons/kernel/power/cpuidle/intel_cstates/intel_cstates.cpp
+++ b/src/add-ons/kernel/power/cpuidle/x86_cstates/x86_cstates.cpp
@@ -25,7 +25,7 @@
 
 #define MWAIT_INTERRUPTS_BREAK		(1 << 0)
 
-#define INTEL_CSTATES_MODULE_NAME	CPUIDLE_MODULES_PREFIX "/intel_cstates/v1"
+#define X86_CSTATES_MODULE_NAME	CPUIDLE_MODULES_PREFIX "/x86_cstates/v1"
 
 #define BASE_TIME_STEP				500
 
@@ -201,9 +201,9 @@ std_ops(int32 op, ...)
 }
 
 
-static cpuidle_module_info sIntelCStates = {
+static cpuidle_module_info sX86CStates = {
 	{
-		INTEL_CSTATES_MODULE_NAME,
+		X86_CSTATES_MODULE_NAME,
 		0,
 		std_ops,
 	},
@@ -218,7 +218,7 @@ static cpuidle_module_info sIntelCStates = {
 
 
 module_info* modules[] = {
-	(module_info*)&sIntelCStates,
+	(module_info*)&sX86CStates,
 	NULL
 };