diff --git a/heimdall/src/decompile/output.rs b/heimdall/src/decompile/output.rs
index d903aae7..570a1174 100644
--- a/heimdall/src/decompile/output.rs
+++ b/heimdall/src/decompile/output.rs
@@ -227,8 +227,8 @@ pub fn build_output(
                     }
 
                     abi.push(
-                        ABIStructure::Error(
-                            ErrorABI {
+                        ABIStructure::Event(
+                            EventABI {
                                 type_: "event".to_string(),
                                 name: resolved_event.name.clone(),
                                 inputs: inputs,
@@ -238,10 +238,10 @@ pub fn build_output(
                 },
                 None => {
                     abi.push(
-                        ABIStructure::Error(
-                            ErrorABI {
+                        ABIStructure::Event(
+                            EventABI {
                                 type_: "event".to_string(),
-                                name: format!("Event_{}", event_selector.get(0..8).unwrap()),
+                                name: format!("Event_{}", event_selector),
                                 inputs: Vec::new(),
                             }
                         )