diff --git a/datamodels/2.x/installation.xml b/datamodels/2.x/installation.xml
index 26335edf6..ec7fe5962 100755
--- a/datamodels/2.x/installation.xml
+++ b/datamodels/2.x/installation.xml
@@ -54,6 +54,15 @@
 					</modules>
 					<default>true</default>
 				</choice>
+        <choice>
+          <extension_code>itop-flow-map</extension_code>
+          <title>Application Data Flows</title>
+          <description>Modelize flows between your applications, with impacts analysis</description>
+          <modules type="array">
+            <module>itop-flow-map</module>
+          </modules>
+          <default>true</default>
+        </choice>
 				<choice>
 					<extension_code>itop-config-mgmt-storage</extension_code>
 					<title>Storage Devices</title>
@@ -80,7 +89,7 @@
                 <modules type="array">
                   <module>itop-container-mgmt</module>
                 </modules>
-                <default>false</default>
+                <default>true</default>
               </choice>
             </options>
           </sub_options>
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 2b7dcf478..01a2be920 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
@@ -21,7 +21,7 @@
             <attribute id="destination_id"/>
             <attribute id="org_id"/>
             <attribute id="source_id"/>
-            <attribute id="flowtype_id"/>
+            <attribute id="dataflowtype_id"/>
           </attributes>
         </reconciliation>
         <obsolescence>
diff --git a/datamodels/2.x/itop-flow-map/module.itop-flow-map.php b/datamodels/2.x/itop-flow-map/module.itop-flow-map.php
index a89b41d2f..2ff936a41 100644
--- a/datamodels/2.x/itop-flow-map/module.itop-flow-map.php
+++ b/datamodels/2.x/itop-flow-map/module.itop-flow-map.php
@@ -10,7 +10,7 @@ SetupWebPage::AddModule(
 	[
 		// Identification
 		//
-		'label' => 'Map applications data flows',
+		'label' => 'Applications data flows',
 		'category' => 'business',
 
 		// Setup