5 files changed, 8 insertions, 15 deletions

diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index 2aea23d..ffdda0d 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
@@ -1635,7 +1635,7 @@ Options:
  -H HOST, --host=HOST Enea uCPE Manager host name or IP address
  -t VNFTYPE, --vnfType=VNFTYPE
  VNF Type (Name of VNF descriptor)
- -n VIMDEVICENAME, --device-name=VIMDEVICENAME
+ -n DEVICENAME, --device-name=DEVICENAME
  Name of the device
  -f PROPSFILE, --file=PROPSFILE
  File containing VNF instance properties in JSON format
@@ -1715,7 +1715,7 @@ Options:
  -H HOST, --host=HOST Enea uCPE Manager host name or IP address
  -i VNFINSTANCENAME, --vnfInstanceName=VNFINSTANCENAME
  Name of VNF instance
- -n VIMDEVICENAME, --device-name=VIMDEVICENAME
+ -n DEVICENAME, --device-name=DEVICENAME
  Name of the device
  -c COMMAND, --command=COMMAND
  Control command (stop, start, pause or resume)
@@ -1799,7 +1799,7 @@ Options:
  -H HOST, --host=HOST Enea uCPE Manager host name or IP address
  -i VNFINSTANCENAME, --vnfInstanceName=VNFINSTANCENAME
  Name of VNF instance
- -n VIMDEVICENAME, --device-name=VIMDEVICENAME
+ -n DEVICENAME, --device-name=DEVICENAME
  Name of the device
 
  Mandatory options:
diff --git a/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml
index bb969c6..f260584 100644
--- a/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml
+++ b/doc/book-enea-nfv-access-cmc-example-usecases/doc/eltf_params_updated.xml
@@ -42,7 +42,7 @@ export PATH=~/bin:$PATH</programlisting></para>
     correct also compared to the "previous" REL VER in pardoc-distro.xml
     "prev_baseline".</bridgehead>
 
-    <para id="EneaLinux_REL_VER"><phrase>2.2.1</phrase></para>
+    <para id="EneaLinux_REL_VER"><phrase>2.2</phrase></para>
 
     <para id="Yocto_VER"><phrase>2.1</phrase></para>
 
diff --git a/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml b/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml
index 38c71b8..f67cfe4 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml
@@ -65,12 +65,6 @@
             <entry>OVS</entry>
             <entry>Open vSwitch.</entry>
           </row>
-
-          <row>
-            <entry>VIM</entry>
-
-            <entry>Virtual Infrastructure Manager.</entry>
-          </row>
         </tbody>
       </tgroup>
     </table>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
index 6632834..a1ebf64 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
@@ -730,16 +730,15 @@
         </listitem>
 
         <listitem>
-          <para><emphasis role="bold">VIM</emphasis>. The uCPE device on which
+          <para><emphasis role="bold">Device</emphasis>. The uCPE device on which
           to instantiate a VNF, i.e. the uCPE device that will run this
           VNF.</para>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Auto-start</emphasis>. If checked, the
-          VNF will be stopped and started when unreachable. When the VIM
-          reports that it has lost connection to the VNF, the uCPE Manager
-          will ask the VIM to terminate the VM and then start it up again. If
+          VNF will be stopped and started when unreachable. When the uCPE Device reports that it has lost connection to the VNF, the uCPE Manager
+          will ask it to terminate the VM and then start it up again. If
           unchecked, only a <literal>Disconnected</literal> notification will
           appear in the uCPE Manager.</para>
         </listitem>
diff --git a/doc/book-enea-nfv-access-vnf-onboarding-guide/doc/instantiation.xml b/doc/book-enea-nfv-access-vnf-onboarding-guide/doc/instantiation.xml
index b06395d..90ffb23 100644
--- a/doc/book-enea-nfv-access-vnf-onboarding-guide/doc/instantiation.xml
+++ b/doc/book-enea-nfv-access-vnf-onboarding-guide/doc/instantiation.xml
@@ -49,7 +49,7 @@
           </listitem>
 
           <listitem>
-            <para>VIM (the uCPE device to instantiate the VNF on).</para>
+            <para>Device (the uCPE device to instantiate the VNF on).</para>
           </listitem>
 
           <listitem>