diff --git a/firmware/application/baseband_api.cpp b/firmware/application/baseband_api.cpp
index 3cad98255..2bff3c537 100644
--- a/firmware/application/baseband_api.cpp
+++ b/firmware/application/baseband_api.cpp
@@ -39,7 +39,7 @@ static void send_message(const Message* const message) {
 	// If message is only sent by this function via one thread, no need to check if
 	// another message is present before setting new message.
 	shared_memory.baseband_message = message;
-	creg::m0apptxevent::assert();
+	creg::m0apptxevent::assert_event();
 	while(shared_memory.baseband_message);
 }
 
diff --git a/firmware/baseband/stream_input.cpp b/firmware/baseband/stream_input.cpp
index ead2d40de..2e7bf65de 100644
--- a/firmware/baseband/stream_input.cpp
+++ b/firmware/baseband/stream_input.cpp
@@ -65,7 +65,7 @@ size_t StreamInput::write(const void* const data, const size_t length) {
 				break;
 			}
 			active_buffer = nullptr;
-			creg::m4txevent::assert();
+			creg::m4txevent::assert_event();
 		}
 	}
 
diff --git a/firmware/baseband/stream_output.cpp b/firmware/baseband/stream_output.cpp
index 9bbf4ece4..c28d8b2fe 100644
--- a/firmware/baseband/stream_output.cpp
+++ b/firmware/baseband/stream_output.cpp
@@ -67,7 +67,7 @@ size_t StreamOutput::read(void* const data, const size_t length) {
 			}
 			// Tell M0 (IRQ) that a buffer has been consumed.
 			active_buffer = nullptr;
-			creg::m4txevent::assert();
+			creg::m4txevent::assert_event();
 		}
 	}
 
diff --git a/firmware/common/lpc43xx_cpp.hpp b/firmware/common/lpc43xx_cpp.hpp
index 13ca9aa77..129ef3900 100644
--- a/firmware/common/lpc43xx_cpp.hpp
+++ b/firmware/common/lpc43xx_cpp.hpp
@@ -69,7 +69,7 @@ inline void disable() {
 #endif
 
 #if defined(LPC43XX_M4)
-inline void assert() {
+inline void assert_event() {
 	__SEV();
 }
 #endif
@@ -93,7 +93,7 @@ inline void disable() {
 #endif
 
 #if defined(LPC43XX_M0)
-inline void assert() {
+inline void assert_event() {
 	__SEV();
 }
 #endif
diff --git a/firmware/common/message_queue.cpp b/firmware/common/message_queue.cpp
index 3001127d8..a7b99b565 100644
--- a/firmware/common/message_queue.cpp
+++ b/firmware/common/message_queue.cpp
@@ -26,12 +26,12 @@ using namespace lpc43xx;
 
 #if defined(LPC43XX_M0)
 void MessageQueue::signal() {
-	creg::m0apptxevent::assert();
+	creg::m0apptxevent::assert_event();
 }
 #endif
 
 #if defined(LPC43XX_M4)
 void MessageQueue::signal() {
-	creg::m4txevent::assert();
+	creg::m4txevent::assert_event();
 }
 #endif