diff --git a/svelte-app/src/lib/ignition-view.ts b/svelte-app/src/lib/ignition-view.ts
index eebac6f..6030722 100644
--- a/svelte-app/src/lib/ignition-view.ts
+++ b/svelte-app/src/lib/ignition-view.ts
@@ -303,7 +303,7 @@ function generateElementBindings(elements: SvgElement[]): Record<string, any> {
     if (!el.tagpaths || el.tagpaths.length === 0) continue;
 
     const prefix = `props.elements[${n}]`;
-    const elName = el.name || el.id || '';
+    const elName = el.id || el.name || '';
 
     const isStartStop = /_SS\d+/i.test(elName);
 
@@ -315,7 +315,7 @@ function generateElementBindings(elements: SvgElement[]): Record<string, any> {
     // Sub-element fill bindings — varies by device type
     const isButton = /_(?:JR|S|SS|EN)\d/i.test(elName);
     const isDpm = /_DPM\d*/i.test(elName);
-    const isMcm = /^MCM\d*/i.test(elName);
+    const isMcm = /^MCM\d*$/i.test(elName);
     const isEpc = /_EPC\d*/i.test(elName);
 
     if (el.elements && el.elements.length > 0) {