diff --git a/Runtime/Bindings/FFI/RmlUi_Renderer_WebGPU.cpp b/Runtime/Bindings/FFI/RmlUi_Renderer_WebGPU.cpp
index 0cc1da08a..535206668 100644
--- a/Runtime/Bindings/FFI/RmlUi_Renderer_WebGPU.cpp
+++ b/Runtime/Bindings/FFI/RmlUi_Renderer_WebGPU.cpp
@@ -130,8 +130,8 @@ Rml::CompiledGeometryHandle RenderInterface_WebGPU::CompileGeometry(Rml::Span<co
 
 	RML_DEBUG_TRACE("Compiled geometry %p (%d vertices + %d indices; %d bytes per vertex)", geometry, num_vertices, num_indices, sizeof(Rml::Vertex));
 
-	geometry_compile_event_t payload {
-		.type = GEOMETRY_COMPILE_EVENT,
+	GEOMETRY_COMPILATION_EVENT_t payload {
+		.type = GEOMETRY_COMPILATION_EVENT,
 		.compiled_geometry = *geometry,
 	};
 	deferred_event_t event { .geometry_compilation_details = payload };
@@ -146,7 +146,7 @@ void RenderInterface_WebGPU::RenderGeometry(Rml::CompiledGeometryHandle rmlGeome
 	RML_DEBUG_TRACE("Rendering compiled geometry %p with translation (%.2f, %.2f)", geometry, rmlTranslationVector.x, rmlTranslationVector.y);
 
 	compilation_render_event_t payload {
-		.type = COMPILATION_RENDER_EVENT,
+		.type = GEOMETRY_RENDER_EVENT,
 		.compiled_geometry = *geometry,
 		.translate_u = rmlTranslationVector.x,
 		.translate_v = rmlTranslationVector.y,
@@ -161,7 +161,7 @@ void RenderInterface_WebGPU::ReleaseGeometry(Rml::CompiledGeometryHandle rmlGeom
 	RML_DEBUG_TRACE("Releasing compiled geometry %p", geometry);
 
 	compilation_release_event_t payload {
-		.type = COMPILATION_RELEASE_EVENT,
+		.type = GEOMETRY_RELEASE_EVENT,
 		.compiled_geometry = *geometry,
 	};
 	deferred_event_t event { .compilation_release_details = payload };
diff --git a/Runtime/Bindings/FFI/interop/interop.lua b/Runtime/Bindings/FFI/interop/interop.lua
index d018ab4ac..f1a5e80d6 100644
--- a/Runtime/Bindings/FFI/interop/interop.lua
+++ b/Runtime/Bindings/FFI/interop/interop.lua
@@ -31,10 +31,9 @@ typedef enum {
 	KEYBOARD_EVENT,
 	CHARACTER_INPUT_EVENT,
 	// RML UI events
+	GEOMETRY_COMPILATION_EVENT,
 	GEOMETRY_RENDER_EVENT,
-	GEOMETRY_COMPILE_EVENT,
-	COMPILATION_RENDER_EVENT,
-	COMPILATION_RELEASE_EVENT,
+	GEOMETRY_RELEASE_EVENT,
 	SCISSORTEST_STATUS_EVENT,
 	SCISSORTEST_REGION_EVENT,
 	TEXTURE_LOAD_EVENT,
@@ -154,10 +153,10 @@ typedef struct geometry_render_event_t {
 	float translate_v;
 } geometry_render_event_t;
 
-typedef struct geometry_compile_event_t {
+typedef struct GEOMETRY_COMPILATION_EVENT_t {
 	int type;
 	rml_geometry_info_t compiled_geometry;
-} geometry_compile_event_t;
+} GEOMETRY_COMPILATION_EVENT_t;
 
 typedef struct compilation_render_event_t {
 	int type;
@@ -240,7 +239,7 @@ typedef union deferred_event_t {
 	character_input_event_t character_input_details;
 	// RML
 	geometry_render_event_t geometry_render_details;
-	geometry_compile_event_t geometry_compilation_details;
+	GEOMETRY_COMPILATION_EVENT_t geometry_compilation_details;
 	compilation_render_event_t compilation_render_details;
 	compilation_release_event_t compilation_release_details;
 	scissortest_status_event_t scissortest_status_details;
diff --git a/Runtime/Bindings/FFI/interop/interop_exports.h b/Runtime/Bindings/FFI/interop/interop_exports.h
index 415e82fb7..e6ef1a42c 100644
--- a/Runtime/Bindings/FFI/interop/interop_exports.h
+++ b/Runtime/Bindings/FFI/interop/interop_exports.h
@@ -22,10 +22,9 @@ typedef enum {
 	KEYBOARD_EVENT,
 	CHARACTER_INPUT_EVENT,
 	// RML UI events
+	GEOMETRY_COMPILATION_EVENT,
 	GEOMETRY_RENDER_EVENT,
-	GEOMETRY_COMPILE_EVENT,
-	COMPILATION_RENDER_EVENT,
-	COMPILATION_RELEASE_EVENT,
+	GEOMETRY_RELEASE_EVENT,
 	SCISSORTEST_STATUS_EVENT,
 	SCISSORTEST_REGION_EVENT,
 	TEXTURE_LOAD_EVENT,
@@ -145,10 +144,10 @@ typedef struct geometry_render_event_t {
 	float translate_v;
 } geometry_render_event_t;
 
-typedef struct geometry_compile_event_t {
+typedef struct GEOMETRY_COMPILATION_EVENT_t {
 	int type;
 	rml_geometry_info_t compiled_geometry;
-} geometry_compile_event_t;
+} GEOMETRY_COMPILATION_EVENT_t;
 
 typedef struct compilation_render_event_t {
 	int type;
@@ -231,7 +230,7 @@ typedef union deferred_event_t {
 	character_input_event_t character_input_details;
 	// RML
 	geometry_render_event_t geometry_render_details;
-	geometry_compile_event_t geometry_compilation_details;
+	GEOMETRY_COMPILATION_EVENT_t geometry_compilation_details;
 	compilation_render_event_t compilation_render_details;
 	compilation_release_event_t compilation_release_details;
 	scissortest_status_event_t scissortest_status_details;