diff --git a/packages/plugins/src/menu/Export104.ts b/packages/plugins/src/menu/Export104.ts
index 9203cf503a..d83869b5e4 100644
--- a/packages/plugins/src/menu/Export104.ts
+++ b/packages/plugins/src/menu/Export104.ts
@@ -66,7 +66,7 @@ export default class Export104 extends LitElement {
       if (signal104Data.isMonitorSignal) {
         line.push(signal104Data.ioa ?? '', '');
       } else {
-        line.push('', signal104Data.ioa ?? '');
+        line.push(signal104Data.ioa ?? '', signal104Data.ioa ?? '');
       }
 
       lines.push(line);
diff --git a/packages/plugins/src/menu/export104/foundation.ts b/packages/plugins/src/menu/export104/foundation.ts
index 7198161ba2..16041f1f4c 100644
--- a/packages/plugins/src/menu/export104/foundation.ts
+++ b/packages/plugins/src/menu/export104/foundation.ts
@@ -17,7 +17,7 @@ interface ExtractSignal104Result {
 
 enum SignalType {
   Monitor,
-  Control,
+  MonitorAndControl,
   Unknown
 }
 
@@ -88,7 +88,7 @@ function extractSignal104Data(addressElement: Element, doc: XMLDocument): Extrac
 
   const substationName = parentSubstation.getAttribute('name');
 
-  const name = `${substationName}${voltageLevelName}${bayName}${doiDesc}`;
+  const name = `${substationName} ${voltageLevelName} ${bayName} ${doiDesc}`;
 
   return {
     signal: {
@@ -112,7 +112,7 @@ function getSignalType(tiString: string): SignalType {
   if ((ti >= 1 && ti <= 21) || (ti >= 30 && ti <= 40)) {
     return SignalType.Monitor;
   } else if ((ti >= 45 && ti <= 51) || (ti >= 58 && ti <= 64)) {
-    return SignalType.Control;
+    return SignalType.MonitorAndControl;
   } else {
     return SignalType.Unknown;
   }
diff --git a/packages/plugins/test/unit/menu/104Export/foundation.test.ts b/packages/plugins/test/unit/menu/104Export/foundation.test.ts
index ee1411f294..44dcb7ecf7 100644
--- a/packages/plugins/test/unit/menu/104Export/foundation.test.ts
+++ b/packages/plugins/test/unit/menu/104Export/foundation.test.ts
@@ -16,35 +16,35 @@ describe('Export104 foundation', () => {
 
     const expectedSignals = [
       {
-        name: 'S1F2V105Control1',
+        name: 'S1 F2 V105 Control1',
         signalNumber: '3001',
         isMonitorSignal: false,
         ioa: '1053001',
         ti: '50'
       },
       {
-        name: 'S1F2V105Control2',
+        name: 'S1 F2 V105 Control2',
         signalNumber: '3002',
         isMonitorSignal: false,
         ioa: '1053002',
         ti: '64'
       },
       {
-        name: 'S1F1V104Behavior',
+        name: 'S1 F1 V104 Behavior',
         signalNumber: '2001',
         isMonitorSignal: true,
         ioa: '1042001',
         ti: '35'
       },
       {
-        name: 'S1F1V104Behavior',
+        name: 'S1 F1 V104 Behavior',
         signalNumber: '2002',
         isMonitorSignal: true,
         ioa: '1042002',
         ti: '35'
       },
       {
-        name: 'S1F1V103Behavior',
+        name: 'S1 F1 V103 Behavior',
         signalNumber: '1003',
         isMonitorSignal: true,
         ioa: '1031003',