diff --git a/proto/ei-scanner b/proto/ei-scanner
index 1f08922..f8d8cce 100755
--- a/proto/ei-scanner
+++ b/proto/ei-scanner
@@ -463,8 +463,7 @@ class ProtocolParser(xml.sax.handler.ContentHandler):
                     self.location,
                 )
 
-            if name.startswith("ei"):
-                name = f"{self.component}{name[2:]}"
+            name = Interface.mangle_name(name, self.component)
             # We only create the interface on the first run, in subsequent runs we
             # re-use them so we can cross reference correctly
             if self._run_counter > 1: