diff --git a/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml b/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml
index 3e2862c4b..6cd79ac2a 100644
--- a/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml
+++ b/datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml
@@ -3,7 +3,7 @@
   <constants>
   </constants>
   <classes>
-    <class id="Flow" _delta="define_if_not_exists">
+    <class id="Flow" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable</category>
@@ -14,7 +14,7 @@
         </style>
         <naming>
           <attributes>
-            <attribute id="flowtype_name"/>
+            <attribute id="flowtype_id_friendlyname"/>
             <attribute id="source_name"/>
             <attribute id="destination_name"/>
           </attributes>
@@ -22,7 +22,7 @@
         <reconciliation>
           <attributes>
             <attribute id="destination_id"/>
-			<attribute id="org_id"/>
+            <attribute id="org_id"/>
             <attribute id="source_id"/>
             <attribute id="flowtype_id"/>
           </attributes>
@@ -79,10 +79,6 @@
           <on_target_delete>DEL_MANUAL</on_target_delete>
           <tracking_level>all</tracking_level>
         </field>
-        <field id="flowtype_name" xsi:type="AttributeExternalField">
-          <extkey_attcode>flowtype_id</extkey_attcode>
-          <target_attcode>name</target_attcode>
-        </field>
         <field id="description" xsi:type="AttributeText">
           <sql>description</sql>
           <default_value/>