diff --git a/headers/os/drivers/ACPI.h b/headers/os/drivers/ACPI.h
index 7c2147d6e0..874587ca6f 100644
--- a/headers/os/drivers/ACPI.h
+++ b/headers/os/drivers/ACPI.h
@@ -154,9 +154,9 @@ typedef struct acpi_resource acpi_resource;
 #endif	// __ACTYPES_H__
 
 
-typedef uint32 (*acpi_event_handler)(void *Context);
+typedef uint32 (*acpi_event_handler)(void *context);
 typedef uint32 (*acpi_gpe_handler) (acpi_handle GpeDevice, uint32 GpeNumber,
-	void *Context);
+	void *context);
 
 typedef acpi_status (*acpi_adr_space_handler)(uint32 function,
 	acpi_physical_address address, uint32 bitWidth, int *value,
@@ -225,9 +225,9 @@ struct acpi_module_info {
 	void		(*reset_fixed_event) (uint32 event);
 
 	status_t	(*install_fixed_event_handler)(uint32 event,
-					interrupt_handler *handler, void *data);
+					acpi_event_handler handler, void *data);
 	status_t	(*remove_fixed_event_handler)(uint32 event,
-					interrupt_handler *handler);
+					acpi_event_handler handler);
 
 	/* Namespace Access */
 
diff --git a/src/add-ons/kernel/bus_managers/acpi/ACPIPrivate.h b/src/add-ons/kernel/bus_managers/acpi/ACPIPrivate.h
index 68084efde1..95e53fc9a7 100644
--- a/src/add-ons/kernel/bus_managers/acpi/ACPIPrivate.h
+++ b/src/add-ons/kernel/bus_managers/acpi/ACPIPrivate.h
@@ -97,9 +97,9 @@ typedef struct acpi_root_info {
 	void		(*reset_fixed_event) (uint32 event);
 
 	status_t	(*install_fixed_event_handler)(uint32 event,
-					interrupt_handler *handler, void *data);
+					acpi_event_handler handler, void *data);
 	status_t	(*remove_fixed_event_handler)(uint32 event,
-					interrupt_handler *handler);
+					acpi_event_handler handler);
 
 	/* Namespace Access */
 
@@ -196,9 +196,9 @@ void disable_fixed_event(uint32 event);
 uint32 fixed_event_status(uint32 event);
 void reset_fixed_event(uint32 event);
 
-status_t install_fixed_event_handler(uint32 event, interrupt_handler* handler,
+status_t install_fixed_event_handler(uint32 event, acpi_event_handler handler,
 	void* data);
-status_t remove_fixed_event_handler(uint32 event, interrupt_handler* handler);
+status_t remove_fixed_event_handler(uint32 event, acpi_event_handler handler);
 
 status_t get_next_entry(uint32 object_type, const char* base, char* result,
 	size_t length, void** _counter);
diff --git a/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
index b44d3a7377..7d48b15dd3 100644
--- a/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
+++ b/src/add-ons/kernel/bus_managers/acpi/BusManager.cpp
@@ -375,7 +375,7 @@ reset_fixed_event(uint32 event)
 
 
 status_t
-install_fixed_event_handler(uint32 event, interrupt_handler* handler,
+install_fixed_event_handler(uint32 event, acpi_event_handler handler,
 	void *data)
 {
 	return AcpiInstallFixedEventHandler(event, (ACPI_EVENT_HANDLER)handler, data) == AE_OK
@@ -384,7 +384,7 @@ install_fixed_event_handler(uint32 event, interrupt_handler* handler,
 
 
 status_t
-remove_fixed_event_handler(uint32 event, interrupt_handler* handler)
+remove_fixed_event_handler(uint32 event, acpi_event_handler handler)
 {
 	return AcpiRemoveFixedEventHandler(event, (ACPI_EVENT_HANDLER)handler) == AE_OK
 		? B_OK : B_ERROR;