ing

src/model/infra/InfraHost.ts

@@ -2,7 +2,7 @@ import { InfraOS } from './InfraOS';
 import { Infra } from './Infra';
 
 export interface InfraHost extends Infra {
-    os?: InfraOS;
+    infraOS?: InfraOS;
     ipv4?: string;
     ipv6?: string;
     mac?: string;

src/model/infra/InfraOS.ts

@@ -3,7 +3,7 @@ import { Infra } from './Infra';
 import { MetaInfraVendor } from '../meta';
 
 export interface InfraOS extends Infra {
-    machine?: InfraMachine;
+    infraMachine?: InfraMachine;
     meta?: string;
     metaInfraVendor?: MetaInfraVendor;
 }

src/model/infra/InfraOSApplication.ts

@@ -2,6 +2,6 @@ import { InfraOS } from './InfraOS';
 import { Infra } from './Infra';
 
 export interface InfraOSApplication extends Infra {
-    os?: InfraOS;
+    infraOS?: InfraOS;
     name?: string;
 }

src/model/infra/InfraOSDaemon.ts

@@ -2,6 +2,6 @@ import { InfraOS } from './InfraOS';
 import { Infra } from './Infra';
 
 export interface InfraOSDaemon extends Infra {
-    os?: InfraOS;
+    infraOS?: InfraOS;
     name?: string;
 }

src/model/infra/InfraOSPort.ts

@@ -3,7 +3,7 @@ import { Infra } from './Infra';
 import { MetaInfraVendor } from '../meta';
 
 export interface InfraOSPort extends Infra {
-    os?: InfraOS;
+    infraOS?: InfraOS;
     port?: number;
     portType?: string;
     metaInfraVendor?: MetaInfraVendor;

src/model/infra/InfraService.ts

@@ -3,7 +3,7 @@ import { Infra } from './Infra';
 import { MetaInfraVendor } from '../meta';
 
 export interface InfraService extends Infra {
-    host?: InfraHost;
+    infraHost?: InfraHost;
     portType?: string;
     port?: number;
     metaInfraVendor?: MetaInfraVendor;

src/model/probe/ProbeHost.ts

@@ -4,5 +4,5 @@ import {InfraHost} from '../infra';
 export interface ProbeHost {
   id?: number;
   probe?: Probe;
-  host?: InfraHost;
+  infraHost?: InfraHost;
 }