diff --git a/src/add-ons/kernel/bus_managers/acpi/oshaiku.cpp b/src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/oshaiku.cpp
rename to src/add-ons/kernel/bus_managers/acpi/ACPICAHaiku.cpp
diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_priv.h b/src/add-ons/kernel/bus_managers/acpi/ACPIPrivate.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/acpi_priv.h
rename to src/add-ons/kernel/bus_managers/acpi/ACPIPrivate.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_busman.c b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/acpi_busman.c
rename to src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_device.c b/src/add-ons/kernel/bus_managers/acpi/Device.cpp
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/acpi_device.c
rename to src/add-ons/kernel/bus_managers/acpi/Device.cpp
diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_embedded_controller.cpp b/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/acpi_embedded_controller.cpp
rename to src/add-ons/kernel/bus_managers/acpi/EmbeddedController.cpp
diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_embedded_controller.h b/src/add-ons/kernel/bus_managers/acpi/EmbeddedController.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/acpi_embedded_controller.h
rename to src/add-ons/kernel/bus_managers/acpi/EmbeddedController.h
diff --git a/src/add-ons/kernel/bus_managers/acpi/Jamfile b/src/add-ons/kernel/bus_managers/acpi/Jamfile
index 8852b64d3e..800fe4e296 100644
--- a/src/add-ons/kernel/bus_managers/acpi/Jamfile
+++ b/src/add-ons/kernel/bus_managers/acpi/Jamfile
@@ -200,12 +200,12 @@ SEARCH on [ FGristFiles $(tables_src) ] = [ FDirName $(HAIKU_TOP) src add-ons ke
 SEARCH on [ FGristFiles $(utilities_src)  ] = [ FDirName $(HAIKU_TOP) src add-ons kernel bus_managers acpi acpica components utilities ] ;
 
 KernelAddon acpi :
-	oshaiku.cpp
-	acpi_busman.c
-	acpi_module.c
-	acpi_device.c
-	acpi_ns_dump.cpp
-	acpi_embedded_controller.cpp
+	ACPICAHaiku.cpp
+	BusManager.cpp
+	Module.cpp
+	Device.cpp
+	NamespaceDump.cpp
+	EmbeddedController.cpp
 	SmallResourceData.cpp
 	:
 	libacpi_ca.a
diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_module.c b/src/add-ons/kernel/bus_managers/acpi/Module.cpp
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/acpi_module.c
rename to src/add-ons/kernel/bus_managers/acpi/Module.cpp
diff --git a/src/add-ons/kernel/bus_managers/acpi/acpi_ns_dump.cpp b/src/add-ons/kernel/bus_managers/acpi/NamespaceDump.cpp
similarity index 100%
rename from src/add-ons/kernel/bus_managers/acpi/acpi_ns_dump.cpp
rename to src/add-ons/kernel/bus_managers/acpi/NamespaceDump.cpp