13 files changed, 876 insertions, 895 deletions
diff --git a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml b/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
index bd51b21..8925498 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
@@ -5,9 +5,8 @@
  <title>Advanced Configurations</title>
  <para>This chapter describes possible configurations for advanced features
-  such as the Hugepage Reservation Service, UEFI Secure Boot and Bare Metal
+  such as the Hugepage Reservation Service customization, UEFI Secure Boot and
-  Provisioning. These features are optional in the Enea NFV Access platform.
+  Bare Metal Provisioning.</para>
-  If you do not intend to use these features, skip this chapter.</para>
  <section id="bare_meta_prov">
    <title>Bare Metal Provisioning</title>
@@ -62,9 +61,18 @@
        </listitem>
        <listitem>
-          <para>A remote management tool is available that can be used to set
+          <para>CSM support and Dual Boot must be enabled in BIOS (i.e. PXE
-          the next boot option to PXE and reboot the uCPE devices in order to
+          booting in legacy mode), while the final Enea NFV Access image will
-          begin the installation.</para>
+          boot in UEFI mode. Doing a mass deployment using legacy PXE booting
+          usually means that SecureBoot is disabled, SecureBoot will need to
+          be enabled afterwards.</para>
+        </listitem>
+        <listitem>
+          <para>A remote management tool such as <literal>ipmitool</literal>
+          (or a vendor-specific tool) is available for use to set the next
+          boot option to PXE and reboot the uCPE devices in order to begin the
+          installation.</para>
        </listitem>
      </itemizedlist>
    </section>
@@ -265,9 +273,9 @@ ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&
  <section id="hugepage_reservation">
    <title>Hugepage Reservation Service</title>
-    <para>NFV Access implements an automatic hugepage allocation service that
+    <para>Enea NFV Access implements an automatic hugepage allocation service
-    is triggered at each startup. The service is skipped if hugepages have
+    that is triggered at each startup. The service is skipped if hugepages
-    been allocated in the kernel boot command line.</para>
+    have been allocated in the kernel boot command line.</para>
    <para>There are two strategies outlined for hugepage allocation:</para>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/prep_deploy.png b/doc/book-enea-nfv-access-getting-started/doc/images/prep_deploy.png
index e93e7f1..e75275e 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/prep_deploy.png
+++ b/doc/book-enea-nfv-access-getting-started/doc/images/prep_deploy.png
Binary files differ
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/prep_execution.png b/doc/book-enea-nfv-access-getting-started/doc/images/prep_execution.png
index 5d5a355..2917cd6 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/prep_execution.png
+++ b/doc/book-enea-nfv-access-getting-started/doc/images/prep_execution.png
Binary files differ
diff --git a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml b/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
index 80ae36b..9e0ccb8 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="installation_guide">
-  <title>Setting up and Installing the NFV Access Base Configuration</title>
+  <title>Setting up and Installing the Enea NFV Access Base
+  Configuration</title>
  <para>The setup and installation steps detailed below will deploy a base
  configuration which will be used as a reference for more complex deployment
@@ -14,45 +15,22 @@
    <itemizedlist>
      <listitem>
-        <para>One CentOS 7 server</para>
+        <para>One server running the CentOS 7 distribution</para>
        <para>Minimal Requirement: 4 Cores, 16 GB RAM and 300 GB single disk
        storage. Make sure the CentOS 7 server is updated to the latest
        revision before installing Enea NFV Access.</para>
-        <para>The purpose of the CentOS 7 server is to host the uCPE Manager.
+        <para>The purpose of the CentOS 7 server is to host the Enea uCPE
-        Network access between the CentOS 7 server and the uCPE devices is
+        Manager. Network access between the CentOS 7 server and the uCPE
-        required. The uCPE Manager and the uCPE devices will be connected on
+        devices is required. The Enea uCPE Manager and the uCPE devices will
-        separate subnets to avoid inconsistencies.</para>
+        be connected on separate subnets to avoid inconsistencies.</para>
-      </listitem>
-      <listitem>
-        <para>A laptop.</para>
-        <para>The laptop is used for 2 scenarios:</para>
-        <itemizedlist>
-          <listitem>
-            <para>Installing the NFV Access Run Time Platform on uCPE
-            Devices.</para>
-          </listitem>
-          <listitem>
-            <para>Connecting to the GUI of the uCPE Manager for management and
-            configuration. Network access between the CentOS 7 server and the
-            laptop is required. Please see the <xi:include
-            href="../../s_docbuild/olinkdb/pardoc-common.xml"
-            xmlns:xi="http://www.w3.org/2001/XInclude"
-            xpointer="element(book_enea_nfv_access_release_info/1)" /> manual
-            available with your release, for recommended browsers.</para>
-          </listitem>
-        </itemizedlist>
      </listitem>
      <listitem>
        <para>One or more uCPE devices.</para>
-        <para>White Box devices where the Enea NFV Access Runtime Platform
+        <para>Whitebox devices where the Enea NFV Access Run Time Platform
        will be installed, containing a minimum of 2 cores and 4 GB RAM and at
        least two ethernet ports that will be configured as WAN and LAN during
        deployment.</para>
@@ -73,6 +51,29 @@
      </listitem>
      <listitem>
+        <para>A laptop.</para>
+        <para>The laptop is used for 2 scenarios:</para>
+        <itemizedlist>
+          <listitem>
+            <para>Installing the Enea NFV Access Run Time Platform on uCPE
+            Devices.</para>
+          </listitem>
+          <listitem>
+            <para>Connecting to the GUI of the Enea uCPE Manager for
+            management and configuration. Network access between the CentOS 7
+            server and the laptop is required. Please see the <xi:include
+            href="../../s_docbuild/olinkdb/pardoc-common.xml"
+            xmlns:xi="http://www.w3.org/2001/XInclude"
+            xpointer="element(book_enea_nfv_access_release_info/1)" /> manual
+            available with your release, for recommended browsers.</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+      <listitem>
        <para>A 16 GB USB stick used for the uCPE Device Installation.</para>
      </listitem>
    </itemizedlist>
@@ -89,9 +90,9 @@
      <para>Any firewall running on the CentOS 7 server may block the
      management protocols required to communicate between the uCPE device and
-      the uCPE Manager as well as between the uCPE Manager and its northbound
+      the Enea uCPE Manager as well as between the Enea uCPE Manager and its
-      clients. Quick handling of a blocking firewall would be to disable it,
+      northbound clients. Quick handling of a blocking firewall would be to
-      typical for a lab environment, through:</para>
+      disable it, typical for a lab environment, through:</para>
      <programlisting>sudo systemctl stop firewalld
 sudo systemctl disable firewalld
@@ -128,7 +129,7 @@ sudo systemctl mask -now firewalld</programlisting>
              <entry>UDP</entry>
-              <entry>Required for the uCPE Manager High Availability
+              <entry>Required for the Enea uCPE Manager High Availability
              Configuration.</entry>
            </row>
@@ -137,7 +138,7 @@ sudo systemctl mask -now firewalld</programlisting>
              <entry>TCP</entry>
-              <entry>Required for the uCPE Manager High Availability
+              <entry>Required for the Enea uCPE Manager High Availability
              Configuration.</entry>
            </row>
@@ -169,7 +170,7 @@ sudo systemctl mask -now firewalld</programlisting>
      </table>
      <para>Use the following command sequence to enable the required ports
-      for deployment of the uCPE Manager:</para>
+      for deployment of the Enea uCPE Manager:</para>
      <programlisting>sudo firewall-cmd --permanent --add-service=80/tcp
 sudo firewall-cmd --permanent --add-service=443/tcp
@@ -184,8 +185,8 @@ sudo firewall-cmd --reload</programlisting>
    <section id="openjdk_postgresql_config">
      <title>Configuring OpenJDK and PostgreSQL</title>
-      <para>The uCPE Manager requires a specific Java version (OpenJDK 11) and
+      <para>The Enea uCPE Manager requires a specific Java version (OpenJDK
-      a PostgreSQL version to operate correctly.</para>
+      11) and a PostgreSQL version to operate correctly.</para>
      <para><emphasis role="bold">Installing OpenJDK</emphasis></para>
@@ -201,7 +202,7 @@ sudo firewall-cmd --reload</programlisting>
          <programlisting>java -version 
 openjdk version "11.0.3" 2019-04-16 LTS 
-OpenJDK Runtime Environment 18.9 (build 11.0.3+7-LTS) 
+OpenJDK Run Time Environment 18.9 (build 11.0.3+7-LTS) 
 OpenJDK 64-Bit Server VM 18.9 (build 11.0.3+7-LTS, mixed mode, sharing) </programlisting>
          <note>
@@ -235,9 +236,10 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</p
        </listitem>
      </orderedlist>
-      <para>The uCPE Manager requires a specific PostgreeSQL version. This is
+      <para>The Enea uCPE Manager requires a specific PostgreeSQL version.
-      embedded in the uCPE Manager installation. In order to avoid conflicts,
+      This is embedded in the Enea uCPE Manager installation. In order to
-      any existing PostgreeSQL installation needs to be uninstalled.</para>
+      avoid conflicts, any existing PostgreeSQL installation needs to be
+      uninstalled.</para>
      <para><emphasis role="bold">Uninstalling PostgreSQL</emphasis></para>
@@ -264,8 +266,8 @@ rm -f /etc/postgres-reg.ini
 userdel postgres</programlisting>
          <note>
-            <para>This step is not necessary if the uCPE Manager will be using
+            <para>This step is not necessary if the Enea uCPE Manager will be
-            an external database (like MariaDB).</para>
+            using an external database (like MariaDB).</para>
          </note>
        </listitem>
      </orderedlist>
@@ -291,8 +293,8 @@ userdel postgres</programlisting>
        </listitem>
        <listitem>
-          <para>Follow the installation steps for the uCPE Manager available
+          <para>Follow the installation steps for the Enea uCPE Manager
-          in <olink targetdoc="book_enea_nfv_access_getting_started"
+          available in <olink targetdoc="book_enea_nfv_access_getting_started"
          targetptr="install_ucpe_mg">Installing the uCPE Manager in the
          <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
          xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -309,7 +311,7 @@ userdel postgres</programlisting>
    <section id="wan_lan_ports">
      <title>Determining the WAN and LAN ports</title>
-      <para>A typical White box comes with multiple physical network ports,
+      <para>A typical whitebox comes with multiple physical network ports,
      ready to be used. The user must determine the purpose and allocation of
      each port. The allocation is later aligned with the software
      configuration within the Enea NFV Access installer.</para>
@@ -320,10 +322,10 @@ userdel postgres</programlisting>
    </section>
    <section id="ucpe_identifier">
-      <title>Determining the uCPE Identifier</title>
+      <title>Determining the DeviceId</title>
      <para>Each uCPE device needs a unique identifier. This identifier is
-      used to match the registration in the uCPE Manager and the offline
+      used to match the registration in the Enea uCPE Manager and the offline
      configuration of the uCPE device during ZTP (Zero Touch
      Provisioning)</para>
@@ -341,7 +343,7 @@ userdel postgres</programlisting>
      installation.</para>
      <para>Access the BIOS using a serial cable between the uCPE device and
-      the laptop, to review and configure the BIOS correctly. The White box
+      the laptop, to review and configure the BIOS correctly. The whitebox
      vendor is expected to provide the right serial cable for the box. A
      terminal emulator (such as putty) is needed on the laptop.</para>
@@ -366,7 +368,7 @@ userdel postgres</programlisting>
      </itemizedlist>
      <para>The boot order may also need to be modified to support
-      installation and execution of the Enea NFV Access Runtime Platform on
+      installation and execution of the Enea NFV Access Run Time Platform on
      the uCPE device.</para>
      <para>The following boot order is recommended for a base
@@ -391,14 +393,14 @@ userdel postgres</programlisting>
    <title>Preparing the deployment</title>
    <section id="install_ucpe_mg">
-      <title>Installing the uCPE Manager</title>
+      <title>Installing the Enea uCPE Manager</title>
-      <para>The uCPE Manager can be installed using as a fresh/first-time
+      <para>The Enea uCPE Manager can be installed using as a fresh/first-time
      configuration or using a backup file of a previous installation, created
-      within the uCPE Manager GUI.</para>
+      within the Enea uCPE Manager GUI.</para>
      <section id="fresh_ucpemg_install">
-        <title>Fresh Installation of the uCPE Manager</title>
+        <title>Fresh Installation of the Enea uCPE Manager</title>
        <para>On the CentOS 7 server open a terminal, log into a bash shell
        with the root account and perform the following:</para>
@@ -442,7 +444,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
            <note>
              <para>The same configuration values set now will need to be
-              provided when upgrading or uninstalling the uCPE Manager.</para>
+              provided when upgrading or uninstalling the Enea uCPE
+              Manager.</para>
            </note>
            <itemizedlist>
@@ -545,7 +548,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
              </listitem>
              <listitem>
-                <para>Install the uCPE Manager as a service with the name
+                <para>Install the Enea uCPE Manager as a service with the name
                <literal>ucpemanager</literal>.</para>
              </listitem>
@@ -556,44 +559,45 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
          </listitem>
          <listitem>
-            <para>Open the IP Address of the CentOS 7 Server in a web browser
+            <para>Using the IPv4 address of the CentOS 7 Server in a web
-            on the laptop and log in with the username and password:
+            browser, running on the laptop, log into the Enea uCPE Manager GUI
-            <literal>admin</literal>/<literal>admin</literal>.</para>
+            using the default username and password:
+            <literal>admin/admin</literal>.</para>
          </listitem>
        </orderedlist>
        <note>
-          <para>The IPv4 address of the CentOS 7 server, connected to the same
+          <para>The IPv4 address of the CentOS 7 Server, connected to the same
          network as the uCPE Devices, will be used as a configuration
-          parameter both when setting up the uCPE devices and when accessing
+          parameter both when setting up the uCPE devices.</para>
-          the uCPE Manager GUI.</para>
        </note>
      </section>
      <section id="install_ucpemg_from_backup">
-        <title>Installation of the uCPE Manager using a System Back-up</title>
+        <title>Installation of the Enea uCPE Manager using a System
+        Back-up</title>
-        <para>The uCPE Manager can be restored if a back-up file has been
+        <para>The Enea uCPE Manager can be restored if a back-up file has been
        previously created.</para>
        <para>A backup file can be created by accessing:
        <literal>System</literal> -&gt; <literal>System Backup</literal> from
-        the uCPE Manager GUI. The resulting zip archive will be located in the
+        the Enea uCPE Manager GUI. The resulting zip archive will be located
-        <filename>/opt/ems/ucpemanager/application/backup</filename> folder
+        in the <filename>/opt/ems/ucpemanager/application/backup</filename>
-        and will be named
+        folder and will be named
        <literal>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</literal> (e.g
        System-Backup_Feb19_2013_2257_42.zip). Save the archive to another
-        location outside the uCPE Manager installation folder for future
+        location outside the Enea uCPE Manager installation folder for future
        use.</para>
        <note>
-          <para>The System Back-up file obtained from the uCPE Manager GUI
+          <para>The System Back-up file obtained from the Enea uCPE Manager
-          (<filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename>) is
+          GUI (<filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename>) is
-          different from the uCPE Manager snapshot obtained during a uCPE
+          different from the Enea uCPE Manager snapshot obtained during a Enea
-          Manager Upgrade or Uninstall operation
+          uCPE Manager Upgrade or Uninstall operation
          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
-          for recovery of the uCPE Manager. For more details please see <olink
+          for recovery of the Enea uCPE Manager. For more details please see
-          targetdoc="book_enea_nfv_access_getting_started"
+          <olink targetdoc="book_enea_nfv_access_getting_started"
          targetptr="restore_prev_ucpe_install">Restoring a previous uCPE
          Manager installation in the <xi:include
          href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -602,8 +606,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
          Manual.</para>
        </note>
-        <para>To install the uCPE Manager with the restore option provide an
+        <para>To install the Enea uCPE Manager with the restore option provide
-        additional argument as shown below during installation:</para>
+        an additional argument as shown below during installation:</para>
        <programlisting>./install.sh \
 /opt/ems Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz \
@@ -612,12 +616,15 @@ SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
    </section>
    <section id="prep_usb_ena">
-      <title>Preparing the USB stick for installation of the NFV Access Run
+      <title>Preparing the USB stick for installation of the Enea NFV Access
-      Time Platform</title>
+      Run Time Platform</title>
      <para>To install the Enea NFV Access Run Time Platform, create a
-      bootable USB stick with the image you intend to install. Follow the
+      bootable USB stick with the image you intend to install. </para>
-      example below to proceed.</para>
+      <para>In the example below, step by step instructions are provided for
+      the CentOS 7 distribution. It's possible with the appropriate tools to
+      also use Windows OS or MacOS.</para>
      <note>
        <para>The .hddimg image is available in the
@@ -674,31 +681,17 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
        </mediaobject>
      </figure>
-      <para>The following hardware configuration is needed to install uCPE
+      <para>While the uCPE device is powered off, in order to install and
-      devices:</para>
+      configure the Enea NFV Access Run Time using the prepared USB stick,
+      connect the laptop to a uCPE device LAN port. For this purpose, a Layer
-      <orderedlist>
+      2 switch or direct cable connection can be used.</para>
-        <listitem>
-          <para>Network connection between the CentOS 7 server and the
-          laptop.</para>
-        </listitem>
-        <listitem>
-          <para>The uCPE device is powered off.</para>
-        </listitem>
-        <listitem>
-          <para>Direct Ethernet cable connection between the uCPE Device LAN
-          and the laptop.</para>
-        </listitem>
-      </orderedlist>
    </section>
    <section id="install_ena_device">
      <title>Installing Enea NFV Access - uCPE Device installation</title>
-      <para>To initiate the installation of the NFV Access Run Time Platform
+      <para>To initiate the installation of the Enea NFV Access Run Time
-      do the following:</para>
+      Platform do the following:</para>
      <orderedlist>
        <listitem>
@@ -706,12 +699,6 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
        </listitem>
        <listitem>
-          <para>Connect a laptop directly into one of the uCPE device ports.
-          This can't be used as a WAN port at a later moment. No other ports
-          should be connected.</para>
-        </listitem>
-        <listitem>
          <para>Power up the uCPE device and boot the USB stick.</para>
        </listitem>
@@ -727,42 +714,49 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
          <itemizedlist>
            <listitem>
-              <para>The static uCPE Manager IP Address.</para>
+              <para>The static Enea uCPE Manager IP Address.</para>
            </listitem>
            <listitem>
-              <para>The unique identifier of the uCPE device (called "uCPE
+              <para>The unique identifier of the uCPE device (called
-              Identifier" in this guide).</para>
+              "DeviceId" in this guide).</para>
            </listitem>
            <listitem>
              <para>Customer Tags. They are used for Zero Touch Provisining
              (ZTP) and can be left empty for a base configuration. What can
              be entered here (if needed), are the tag(s) specified when
-              creating an offline configuration in the uCPE Manager. A later
+              creating an offline configuration in the Enea uCPE Manager. A
-              addition of customer tags can only be done by reinstalling the
+              later addition of customer tags can only be done by reinstalling
-              uCPE devices.</para>
+              the uCPE devices.</para>
            </listitem>
          </itemizedlist>
        </listitem>
        <listitem>
-          <para>On the second page of the Web-installer, the user must fill
+          <para>Connect the WAN cable to the uCPE device (see Figure 2). This
-          in:</para>
+          will be used as the uCPE management network interface, as described
+          below.</para>
+        </listitem>
+        <listitem>
+          <para>On the second page of the Web-installer, the user must do the
+          following:</para>
          <itemizedlist>
            <listitem>
-              <para>The Management Interface. The network interface used by
+              <para>Configure the management network interface. This interface
-              the uCPE Manager to communicate with the uCPE device.</para>
+              is used by the Enea uCPE Manager to communicate with the uCPE
+              device.</para>
            </listitem>
            <listitem>
-              <para>During network configuration, WAN cables are plugged into
+              <para>Plug-in additional WAN interfaces (if applicable) and
-              the uCPE device to identify ports and make them available for
+              provide their Layer 3 configuration.</para>
-              configuration. The user needs to connect the same number of
+            </listitem>
-              cables as the number of WAN ports that he wishes to configure
-              (DHCP is the default setting). The configured WAN cables cannot
+            <listitem>
-              be removed after being configured.</para>
+              <para>The Static or Dynamic IP.</para>
              <note>
                <para>No LAN ports should be connected nor configured at this
@@ -771,22 +765,15 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
                Web-Installer.</para>
              </note>
            </listitem>
-            <listitem>
-              <para>The Layer 3 configuration of WAN Interface(s).</para>
-            </listitem>
-            <listitem>
-              <para>The Static or Dynamic IP.</para>
-            </listitem>
          </itemizedlist>
        </listitem>
      </orderedlist>
      <para>When the user has completed the configuration steps in the
-      Web-installer, NFV Access is installed on the hard drive (the largest
+      Web-installer, Enea NFV Access is installed on the hard drive. At this
-      drive found on the uCPE device will be used for installation. Now the
+      stage, user should remove the USB stick and LAN cable and shutdown the
-      user must remove USB stick and reboot the device.</para>
+      uCPE device. It will be started after necessary configurations are done
+      on the Enea uCPE Manager, as described below.</para>
    </section>
    <section id="prep_phys_exec">
@@ -802,26 +789,18 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
        </mediaobject>
      </figure>
-      <para>The following hardware configuration is needed for service
+      <para>The following network configuration is needed for managing the
-      deployment:</para>
+      uCPE device and service deployment:</para>
      <itemizedlist>
        <listitem>
-          <para>Network connection between the CentOS 7 server and the
+          <para>Network connection between the server running the Enea uCPE
-          laptop.</para>
+          Manager and the laptop.</para>
-        </listitem>
-        <listitem>
-          <para>Network connection between the CentOS 7 server and the uCPE
-          device WAN port.</para>
        </listitem>
        <listitem>
-          <para>The USB is removed from the uCPE device.</para>
+          <para>Network connection between the server running the Enea uCPE
-        </listitem>
+          Manager and the uCPE device.</para>
-        <listitem>
-          <para>The uCPE device powered off.</para>
        </listitem>
      </itemizedlist>
    </section>
@@ -830,15 +809,15 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
  <section id="mg_ucpe_devices">
    <title>Management of uCPE Devices</title>
-    <para>When the installation is complete the uCPE Device can be connected
+    <para>When the installation is complete the uCPE device can be managed in
-    to uCPE Manager.</para>
+    the Enea uCPE Manager.</para>
    <section id="add_offline_config">
      <title>Add a default Offline Configuration</title>
      <para>Zero Touch Provisioning is always turned on when a uCPE device
-      connects to the uCPE Manager. To enable it in the uCPE Manager, an
+      connects to the Enea uCPE Manager. To enable it in the Enea uCPE
-      offline configuration needs to be registered for Day-0
+      Manager, an offline configuration needs to be registered for Day-0
      configuration.</para>
      <note>
@@ -851,10 +830,11 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      </note>
      <para>The offline configuration consists of data and parameters that are
-      meant to be automatically set when a uCPE device connects to the uCPE
+      meant to be automatically set when a uCPE device connects to the Enea
-      Manager for the first time. The configuration is typically focused on
+      uCPE Manager for the first time. The configuration is typically focused
-      setting up the network management of the uCPE device, e.g. configuring
+      on setting up the network management of the uCPE device, e.g.
-      network interfaces, WAN and LAN networking and service chains.</para>
+      configuring network interfaces, WAN and LAN networking and service
+      chains.</para>
      <para>For this base configuration, the offline configuration will be
      left blank. The blank offline configuration can be filled with
@@ -864,14 +844,14 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
      <note>
        <para>If the offline configuration is not configured, an alarm will be
        raised: <literal>Day-0 Config:ZTP:Major</literal> when the uCPE device
-        tries to connect to uCPE Manager, informing the user that the ZTP
+        tries to connect to Enea uCPE Manager, informing the user that the ZTP
        setup failed for the uCPE device.</para>
      </note>
      <para><emphasis role="bold">To create an offline
      configuration</emphasis> <orderedlist>
          <listitem>
-            <para>In a browser access the uCPE Manager, then
+            <para>In a browser access the Enea uCPE Manager, then
            <literal>Applications</literal>-&gt;<literal>Offline
            Config</literal>.</para>
          </listitem>
@@ -886,8 +866,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
            string identifying the configuration. The
            <literal>deviceVersion</literal> must match the Enea NFV Access
            version of the uCPE device and the <literal>deviceId</literal>
-            must be the previously set identifier of the uCPE device (uCPE
+            must be the previously set identifier of the uCPE device
-            Identifier).</para>
+            (DeviceId).</para>
          </listitem>
        </orderedlist></para>
    </section>
@@ -895,15 +875,11 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
    <section id="add_ucpe_mg">
      <title>Add a uCPE device to the Management System</title>
-      <para>The uCPE Manager will periodically poll the uCPE device based on
+      <para>In order to enroll a uCPE device in the management system and
-      the IP address broadcasted by the uCPE device, attempting to establish a
+      establish a management connection, the user will add uCPE device
-      management connection.</para>
+      information in the Enea uCPE Manager. This is accomplished by selecting
-      <para>For the connection to succeed, add the uCPE device running the NFV
-      Access Run Time Platform to the management system:
      <literal>Devices</literal> -&gt; <literal>Manage</literal> -&gt;
-      <literal>Add</literal>. Supply information about the uCPE device and set
+      <literal>Add</literal>. </para>
-      the parameters that will be used to connect to it.</para>
      <para>The relevant parameters are:</para>
@@ -915,7 +891,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
        <listitem>
          <para><emphasis role="bold">Name.</emphasis> The name by which the
-          uCPE device is referred to in the uCPE Manager.</para>
+          uCPE device is referred to in the Enea uCPE Manager.
+          (Mandatory).</para>
        </listitem>
        <listitem>
@@ -941,7 +918,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
        <listitem>
          <para><emphasis role="bold">Device ID.</emphasis> The unique
-          identifier of the uCPE device.</para>
+          identifier of the uCPE device. (Mandatory).</para>
        </listitem>
      </itemizedlist>
    </section>
@@ -949,18 +926,36 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
    <section id="boot_device_add_map">
      <title>Booting the uCPE device and adding it to the Map</title>
-      <para>When connectivity is established with the uCPE Manager and a uCPE
+      <para>When connectivity is established with the Enea uCPE Manager and a
-      device is already registered with a matching <literal>Device
+      uCPE device is already registered with a matching <literal>Device
      ID</literal>, the installation is complete, and the connection is
      established.</para>
      <note>
        <para>In case of failure due to a misconfiguration or if a uCPE device
-        does not appear in the uCPE Manager, a reinstallation is needed .The
+        does not appear in the Enea uCPE Manager, a reinstallation is needed
-        user should remove all WAN cables, reinsert the USB stick, reconnect
+        .The user should remove all WAN cables, reinsert the USB stick,
-        the laptop using the ethernet cable, reboot the uCPE device and then
+        reconnect the laptop using the ethernet cable, reboot the uCPE device
-        access the Web-installer
+        and then access the Web-installer
        (<literal>http://172.16.1.1</literal>).</para>
+        <para>In case of management connection failure (e.g. due to a
+        misconfiguration), the uCPE device status will be seen as RED
+        (disconnected) in Enea uCPE Manager. Please check the accuracy of the
+        information provided when the uCPE device was registered in the Enea
+        uCPE Manager. </para>
+        <para>The uCPE device configuration can be amended. In order to do
+        that, please remove the WAN cable(s), reconnect the laptop to the LAN
+        interface of the uCPE device and reboot it. At this point, the
+        Web-installer can be accessed from the laptop as described in <olink
+        targetdoc="book_enea_nfv_access_getting_started"
+        targetptr="install_ena_device">Installing Enea NFV Access - uCPE
+        Device installation in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+        Manual.</para>
      </note>
      <para>When a uCPE device is registered it can be manually added to the
@@ -972,31 +967,31 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
  <section id="ucpe_monitor">
    <title>uCPE Device Monitorization and Control</title>
-    <para>Once the uCPE device is connected to the uCPE Manager, it is ready
+    <para>Once the uCPE device is connected to the Enea uCPE Manager, it is
-    for central management. Two important functions available in the uCPE
+    ready for central management. Two important functions available in the
-    Manager GUI are alarm checking and resource allocation.</para>
+    Enea uCPE Manager GUI are alarm checking and resource allocation.</para>
    <section id="check_alarms">
      <title>Checking Alarms</title>
-      <para>The uCPE Manager dashboard presents alarms in a specific window on
+      <para>The Enea uCPE Manager dashboard presents alarms in a specific
-      the front page.</para>
+      window on the front page.</para>
      <para>An alarm can be easily triggered by disconnecting and reconnecting
      the WAN ethernet cable from the uCPE device. The management system will
      detect the broken link and raise an alarm: <literal>Device
      Disconnected::Critical</literal>.</para>
-      <para>A separate Alarm Management window can be accessed from the uCPE
+      <para>A separate Alarm Management window can be accessed from the Enea
-      Manager menu for in-depth access and programming of Alarms and
+      uCPE Manager menu for in-depth access and programming of Alarms and
      Events.</para>
    </section>
    <section id="ck_resource_alloc">
      <title>Checking uCPE device Resource Allocation</title>
-      <para>When the uCPE device is connected to the uCPE Manager it is of
+      <para>When the uCPE device is connected to the Enea uCPE Manager it is
-      interest to check the amount of hardware resources in use.</para>
+      of interest to check the amount of hardware resources in use.</para>
      <para>To check CPU, RAM and disk utilization simply select the uCPE
      device and click the <literal>Virtual Machines</literal> tab in the map
@@ -1007,15 +1002,27 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
    <section id="access_device_cli">
      <title>Accessing the uCPE device CLI</title>
-      <para>As a final check to make sure the uCPE device was installed
+      <para>As a final check to make sure the uCPE device was installed and
-      correctly, access its Linux CLI by marking the uCPE device on the map
+      configured correctly, access the uCPE device Linux CLI by selecting the
-      and selecting <literal>SSH</literal> from the panel. A new window will
+      uCPE device on the map and using the SSH button from the panel. A new
-      appear for CLI access. The default user and password are
+      window will appear for CLI access. The default user and password are
      <literal>root</literal> and blank, respectively.</para>
      <para>The Enea NFV Access CLI is a pure Linux CLI providing access to
      standard Linux CLI commands. The CLI is a central feature for running
      custom scripting.</para>
+      <note>
+        <para>In case the uCPE was installed behind a NAT device, reverse SSH
+        connection will be used. For more details, please see <olink
+        targetdoc="book_enea_nfv_access_getting_started"
+        targetptr="device_callhome_nat">Device Call Home Connection for
+        deployment behind NAT in the <xi:include
+        href="../../s_docbuild/olinkdb/pardoc-names.xml"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
+        xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+        Manual.</para>
+      </note>
    </section>
  </section>
 </chapter>
 \ No newline at end of file
diff --git a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
index 0509566..c303902 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
@@ -17,11 +17,6 @@
      <para>One or several managed uCPE devices, ready to host network
      services, using one wired WAN and one wired LAN connection.</para>
    </listitem>
-    <listitem>
-      <para>One laptop accessing both the uCPE Manager and the uCPE
-      device.</para>
-    </listitem>
  </itemizedlist>
  <para>Extended deployment and configuration options are also detailed in the
@@ -65,17 +60,19 @@
    <section id="nfv_access">
      <title>Enea NFV Access Run Time Platform</title>
-      <para>The Enea NFV Access Run Time Platform is a lightweight,
+      <para>Enea NFV Access Runtime Platform is a lightweight,
-      multi-architecture virtualization platform, supporting Virtual Machines
+      multi-architecture virtualization platform built on de-facto standards
-      (KVM / QEMU) and container(s) (Docker). Designed for a low footprint and
+      in an SDN/NFV ecosystem. It is designed for a high networking
-      fast boot by only providing essential functionality.</para>
+      performance with minimal hardware footprint, by only providing relevant
+      functionalties and technologies.</para>
-      <para>The NFV Access virtualized data plane has DPDK and accelerated OVS
-      as its primary components. The data plane is highly optimized for
-      scenarios where high throughput and low latency are needed.</para>
-      <para>VNF Runtime Management, orchestration integration, and FCAPS are
+      <para>Virtualization methods include Virtual Machines (KVM / QEMU) and
-      provided through NETCONF.</para>
+      container(s) (Docker). High networking throughput and low latency are
+      ensured by accelerated data plane relying on technologies like DPDK,
+      OVS-DPDK and SR-IOV/PCI-Passthrough. Key functionalities, such as
+      platform software management, virtualized networking, VNFs life-cycle
+      management and FCAPS are provided through the YANG-modelled NETCONF
+      protocol.</para>
      <figure>
        <title>VNF Space</title>
@@ -92,10 +89,10 @@
    <section id="ucpe_manager">
      <title>Enea uCPE Manager</title>
-      <para>The Enea uCPE Manager is a control center application providing a
+      <para>The Enea uCPE Manager is centralized control system providing
-      full FCAPS and VNF management experience through a GUI and REST API. It
+      uCPEs domain management capabilities through a GUI and REST API. It can
-      can be deployed on a host or a virtual machine running 64-bit CentOS 7
+      be deployed on a host or a virtual machine running 64-bit CentOS 7 on an
-      on an x86 platform. The uCPE Manager uses a southbound NETCONF protocol
+      x86 platform. The Enea uCPE Manager uses a southbound NETCONF protocol
      to connect and manage uCPE devices.</para>
      <para>The Enea uCPE Manager provides the following key features:</para>
@@ -142,7 +139,7 @@
            <row>
              <entry>Enea NFV Access</entry>
-              <entry>The Enea NFV Access Run Time Platform and the uCPE
+              <entry>The Enea NFV Access Run Time Platform and the Enea uCPE
              Manager.</entry>
            </row>
@@ -161,14 +158,6 @@
            </row>
            <row>
-              <entry>PCI Passthrough</entry>
-              <entry>PCI Passthrough allows for use of a physical PCI device,
-              e.g. a network card inside a VM. If you "PCI passthrough" a
-              device, the device is not available to the host anymore.</entry>
-            </row>
-            <row>
              <entry>uCPE device</entry>
              <entry>A whitebox running the Enea NFV Access Run Time
diff --git a/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml b/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml
index 22b67b9..1c66db0 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml
@@ -3,15 +3,15 @@
  <title>Using the Log Collector</title>
  <para>Troubleshooting problems on the uCPE device require an analysis of a
-  set of information i.e. logs collected from the uCPE device and/or uCPE
+  set of information i.e. logs collected from the uCPE device and/or Enea uCPE
  Manager. The following describe how the log collection mechanism
  works.</para>
  <section id="log_collect_ucpem">
-    <title>Log collecting using the uCPE Manager</title>
+    <title>Log collecting using the Enea uCPE Manager</title>
-    <para>The uCPE Manager allows for collection of the relevant logs from the
+    <para>The Enea uCPE Manager allows for collecting a set of logs and state
-    GUI.</para>
+    information from a uCPE device.</para>
    <section id="log_collect">
      <title>Collecting the Logs</title>
@@ -53,9 +53,9 @@
      <note>
        <para>It might take some time for the archive to be created. When the
        operation completes, a "CollectLogsComplete" notification is sent from
-        the uCPE device to the uCPE Manager. This can be viewed in the GUI
+        the uCPE device to the Enea uCPE Manager. This can be viewed in the
-        under the <literal>Faults</literal> -&gt; <literal>Events</literal>
+        GUI under the <literal>Faults</literal> -&gt;
-        toolbar menu.</para>
+        <literal>Events</literal> toolbar menu.</para>
        <figure>
          <title>Collecting Debug Logs</title>
@@ -110,7 +110,7 @@
      <title>Downloading Logs from the uCPE Device</title>
      <para>This option transfers a debug file archive from the uCPE device to
-      uCPE Manager machine.</para>
+      Enea uCPE Manager.</para>
      <orderedlist>
        <listitem>
@@ -124,7 +124,7 @@
        <listitem>
          <para>In the <literal>Device File Listing</literal> table, select
-          the archive you want to download from the uCPE device to uCPE
+          the archive you want to download from the uCPE device to Enea uCPE
          Manager.</para>
        </listitem>
@@ -133,7 +133,7 @@
          button.</para>
          <para>The archive will be downloaded from the uCPE device and stored
-          on the uCPE Machine.</para>
+          on the Enea uCPE Manager.</para>
        </listitem>
      </orderedlist>
@@ -146,9 +146,9 @@
    <section id="download_logs_locally">
      <title>Downloading collected logs locally</title>
-      <para>This option downloads a logs archive from the uCPE Manager to a
+      <para>This option downloads a logs archive from the Enea uCPE Manager to
-      local (user) machine for analysis. The archive must first be available
+      a local (user) machine for analysis. The archive must first be available
-      in the uCPE Manager in order to be downloaded.</para>
+      in the Enea uCPE Manager in order to be downloaded.</para>
      <orderedlist>
        <listitem>
@@ -236,9 +236,10 @@
    </section>
    <section id="delete_archives_ucpem">
-      <title>Deleting logs archives from the uCPE Manager</title>
+      <title>Deleting logs archives from the Enea uCPE Manager</title>
-      <para>This option deletes a logs archive from the uCPE Manager.</para>
+      <para>This option deletes a logs archive from the Enea uCPE
+      Manager.</para>
      <orderedlist>
        <listitem>
@@ -258,14 +259,14 @@
        <listitem>
          <para>Click the <literal>Delete</literal> button.</para>
-          <para>The file will be deleted from the uCPE Manager and the table
+          <para>The file will be deleted from the Enea uCPE Manager and the
-          will be updated.</para>
+          table will be updated.</para>
        </listitem>
      </orderedlist>
      <note>
-        <para>Deleting the logs file from the uCPE Manager does not affect the
+        <para>Deleting the logs file from the Enea uCPE Manager does not
-        file located on the uCPE device.</para>
+        affect the file located on the uCPE device.</para>
      </note>
    </section>
@@ -273,8 +274,8 @@
      <title>Enabling/Disabling of the Log Collector via Permissions</title>
      <para>To disable the ability to access/download the uCPE device's
-      debug-log files from the uCPE Manager, the appropriate permissions must
+      debug-log files from the Enea uCPE Manager, the appropriate permissions
-      be changed:</para>
+      must be changed:</para>
      <orderedlist>
        <listitem>
@@ -319,19 +320,19 @@
    </section>
    <section id="download_ucpemg_logs">
-      <title>Downloading uCPE Manager logs</title>
+      <title>Downloading Enea uCPE Manager logs</title>
-      <para>Often, sending the uCPE Manager logs together with collected uCPE
+      <para>Often, sending the Enea uCPE Manager logs together with collected
-      device logs to the support team provides important information for
+      uCPE device logs to the support team provides important information for
      troubleshooting (especially in cases of connectivity issues with the
      uCPE device and error popups).</para>
-      <para>uCPE Manager log files are located in
+      <para>Enea uCPE Manager log files are located in
-      <filename>application/logs/</filename> in the uCPE Manager's
+      <filename>application/logs/</filename> in the Enea uCPE Manager's
      installation folder
      (e.g.<filename>/opt/ems/ucpemanager/application/logs</filename>). They
      can be copied from that location, or they can be downloaded using the
-      uCPE Manager GUI by performing the following:</para>
+      Enea uCPE Manager GUI by performing the following:</para>
      <orderedlist>
        <listitem>
@@ -372,12 +373,12 @@
  </section>
  <section id="log_collect_no_ucpem">
-    <title>Log collecting without using the uCPE Manager</title>
+    <title>Log collecting without using the Enea uCPE Manager</title>
    <para>Log collection from uCPE Devices can also be done when there is no
-    uCPE Manager connection. A SSH connection to uCPE Device is needed for use
+    Enea uCPE Manager connection. A SSH connection to uCPE Device is needed
-    of the log collector script, which can be found in the uCPE Device file
+    for use of the log collector script, which can be found in the uCPE Device
-    system in <literal>/usr/local/enea/</literal>.</para>
+    file system in <literal>/usr/local/enea/</literal>.</para>
    <para>The Log collector script takes relevant information about the system
    and collects it in an archive:</para>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml b/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml
index 4c11b7c..873dc28 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml
@@ -2,23 +2,23 @@
 <chapter id="net_config_operations">
  <title>Network Configuration Options</title>
-  <para>Various Advanced Network Configuration options can be done from uCPE
+  <para>Various Advanced Network Configuration options can be done from Enea
-  Manager GUI.</para>
+  uCPE Manager GUI.</para>
  <section id="device_callhome_nat">
    <title>Device Call Home Connection for deployment behind NAT</title>
    <para>The Device Call Home option enables the initiation of the connection
-    between the uCPE Device and the uCPE Manager, from the uCPE device. The
+    between the uCPE Device and the Enea uCPE Manager, from the uCPE device.
-    Device Call Home option is required when deploying a uCPE device behind
+    The Device Call Home option is required when deploying a uCPE device
-    NAT since the IP address of the uCPE device is hidden for the uCPE
+    behind NAT since the IP address of the uCPE device is hidden for the Enea
-    Manager.</para>
+    uCPE Manager.</para>
    <para>Enable Device Call Home by marking the Device Call Home checkbox
-    when registering the uCPE device in uCPE Manager. When using this
+    when registering the uCPE device in Enea uCPE Manager. When using this
-    mechanism, the device will initiate a connection to the uCPE Manager for
+    mechanism, the device will initiate a connection to the Enea uCPE Manager
-    NETCONF traffic (over SSH), while the uCPE Manager waits for a device
+    for NETCONF traffic (over SSH), while the Enea uCPE Manager waits for a
-    connection.</para>
+    device connection.</para>
  </section>
  <section id="device_net_config">
@@ -57,18 +57,18 @@
      <itemizedlist>
        <listitem>
          <para><emphasis role="bold">LCore Mask</emphasis>. Allocated cores
-          for DPDK management functions (CPU core bitmask). Default:
+          for non-datapath OVS-DPDK threads (CPU core bitmask). Default:
          0x2.</para>
        </listitem>
        <listitem>
          <para><emphasis role="bold">PMD CPU Mask</emphasis>. Allocated cores
-          for DPDK packet processing (CPU core bitmask). Default: 0x4.</para>
+          for datapath processing (CPU core bitmask). Default: 0x4.</para>
        </listitem>
        <listitem>
-          <para><emphasis role="bold">Socket Memory</emphasis>. Allocated
+          <para><emphasis role="bold">Socket Memory</emphasis>. Hugepage
-          memory to use. Default: 1494.</para>
+          memory allocated for DPDK. Default: 1494.</para>
        </listitem>
      </itemizedlist>
    </section>
@@ -88,10 +88,10 @@
      virtualization infrastructure and VNFs, they must be configured into the
      management system.</para>
-      <para>To add an interface into the uCPE Manager, select the uCPE device,
+      <para>To add an interface into the Enea uCPE Manager, select the uCPE
-      then from the top toolbar select <literal>Configuration -&gt; External
+      device, then from the top toolbar select <literal>Configuration -&gt;
-      Interfaces -&gt; Configuration -&gt; Add</literal>. The available
+      External Interfaces -&gt; Configuration -&gt; Add</literal>. The
-      Interface types are detailed below.</para>
+      available Interface types are detailed below.</para>
      <section id="dpdk_interface_type">
        <title>DPDK Interface Type</title>
@@ -117,10 +117,6 @@
          </listitem>
          <listitem>
-            <para>Type: dpdk</para>
-          </listitem>
-          <listitem>
            <para>Networking-type: dpdk</para>
          </listitem>
@@ -149,10 +145,6 @@
          </listitem>
          <listitem>
-            <para>Type: sr-iov</para>
-          </listitem>
-          <listitem>
            <para>Networking-type: srIov</para>
          </listitem>
@@ -172,9 +164,7 @@
        <para>Some of the physical network interfaces available on a uCPE
        device, including Ethernet interfaces, do not have DPDK or SR-IOV
-        support. Instead, the Linux kernel driver has to be used. Wi-Fi and
+        support. Instead, the Linux kernel driver has to be used.</para>
-        4G/LTE modems can also be configured and used for virtualization
-        infrastructure and VNFs.</para>
        <para>To add Standard Interfaces under the management system, the user
        must set values for the following fields:</para>
@@ -190,13 +180,54 @@
        </itemizedlist>
      </section>
-      <section condition="hidden" id="pci_passthrough_interface_type">
+      <section id="wan_interface_type">
-        <title>PCI Passthrough Interface Type</title>
+        <title>Wan Interface Type</title>
+        <para>WAN interfaces configured during the installation of the uCPE
+        device are automatically added in the Enea uCPE manager as type
+        <literal>wan</literal>. The WAN interface used for management of the
+        uCPE device is marked with the <literal>Management</literal> property
+        set to <literal>True</literal>.</para>
-        <para>For the PCI Passthrough a user does not have to configure a
+        <para>If a WAN interface is to be assigned for use by a VNF, it must
-        physical interface, instead simply select the PCI address and connect
+        be changed into another interface type depending on the type of
-        it to a virtual port when the VNF instantiation step is
+        connection that will be used. The management WAN interface cannot be
-        reached.</para>
+        changed to a different type. It is automatically used when an In-band
+        management bridge is created.</para>
+        <para><emphasis role="bold">How to Edit the Configuration of a Wan
+        Interface</emphasis></para>
+        <orderedlist>
+          <listitem>
+            <para>To edit an interface configuration type from the Enea uCPE
+            Manager, select the uCPE device, then from the top toolbar select
+            the <literal>Configuration</literal> menu then <literal>External
+            Interfaces -&gt; Configuration</literal>. The already configured
+            interfaces are displayed here, as can be seen in the figure
+            above.</para>
+          </listitem>
+          <listitem>
+            <para>In order to edit an already configured interface, (as in the
+            example popup shown below, a WAN interface) double click on the
+            desired one and a popup will appear. A different popup appears for
+            each type of interface. From the <literal>Host Interface</literal>
+            window, a user can change the networking type and the IP address
+            assignment:</para>
+            <figure>
+              <title>Editing an Interface</title>
+              <mediaobject>
+                <imageobject>
+                  <imagedata align="center" contentwidth="450"
+                             fileref="images/edit_inter.png" />
+                </imageobject>
+              </mediaobject>
+            </figure>
+          </listitem>
+        </orderedlist>
      </section>
      <section id="man_configuration">
@@ -207,534 +238,465 @@
        <literal>External Interfaces</literal>, where one can find a list of
        available network interfaces and their capabilities.</para>
-        <section id="configure_interfaces">
+        <para>After networking interfaces have been added to the Enea uCPE
-          <title>Configuring Interfaces</title>
+        Manager, the user can change the interface type (DPDK, SR-IOV,
+        Standard, WAN).</para>
-          <para>After networking interfaces have been added to the uCPE
+        <figure>
-          Manager, the user can change the interface type (DPDK, SR-IOV,
+          <title>Configuration of External Interfaces</title>
-          Standard, WAN).</para>
-          <note>
+          <mediaobject>
-            <para>WAN interfaces, which are configured during the installation
+            <imageobject>
-            of the device, do not need to be added, they will be automatically
+              <imagedata align="center" contentwidth="600"
-            listed as such in the uCPE Manager when the device
+                         fileref="images/edit_inter_config.png" />
-            connects.</para>
+            </imageobject>
-          </note>
+          </mediaobject>
+        </figure>
+      </section>
+    </section>
-          <figure>
+    <section id="configure_bridges">
-            <title>Configuration of External Interfaces</title>
+      <title>Configuring Bridges</title>
-            <mediaobject>
-              <imageobject>
-                <imagedata align="center" contentwidth="600"
-                           fileref="images/edit_inter_config.png" />
-              </imageobject>
-            </mediaobject>
-          </figure>
-          <para><emphasis role="bold">How to Edit the Configuration of an
-          Interface</emphasis></para>
-          <orderedlist>
-            <listitem>
-              <para>To edit an interface configuration type from the uCPE
-              Manager, select the uCPE device, then from the top toolbar
-              select the <literal>Configuration</literal> menu then
-              <literal>External Interfaces -&gt; Configuration</literal>. The
-              already configured interfaces are displayed here, as can be seen
-              in the figure above.</para>
-            </listitem>
-            <listitem>
-              <para>In order to edit an already configured interface, (as in
-              the example popup shown below, a WAN interface) double click on
-              the desired one and a popup will appear. A different popup
-              appears for each type of interface. From the <literal>Host
-              Interface</literal> window, a user can change the networking
-              type and the IP address assignment:</para>
-              <figure>
-                <title>Editing an Interface</title>
-                <mediaobject>
-                  <imageobject>
-                    <imagedata align="center" contentwidth="450"
-                               fileref="images/edit_inter.png" />
-                  </imageobject>
-                </mediaobject>
-              </figure>
-            </listitem>
-          </orderedlist>
-          <note>
+      <para>After networking interfaces have been added to the Enea uCPE
-            <para>The IP address assignment of an interface can be set as
+      Manager, the user can create the necessary OVS bridges.</para>
-            static or dynamic for each type of interface.</para>
-          </note>
+      <figure>
-        </section>
+        <title>OVS Bridges</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata align="center" contentwidth="600"
+                       fileref="images/ovs_bridges_tab.png" />
+          </imageobject>
+        </mediaobject>
+      </figure>
+      <para><emphasis role="bold">How to add OVS bridges in the Enea uCPE
+      Manager</emphasis></para>
+      <orderedlist>
+        <listitem>
+          <para>Select the uCPE device.</para>
+        </listitem>
-        <section id="configure_bridges">
+        <listitem>
-          <title>Configuring Bridges</title>
+          <para>Select <literal>Configuration</literal>.</para>
+        </listitem>
-          <para>After networking interfaces have been added to the uCPE
+        <listitem>
-          Manager, the user can create the necessary OVS bridges.</para>
+          <para>Click <literal>OpenvSwitch</literal>.</para>
+        </listitem>
-          <figure>
+        <listitem>
-            <title>OVS Bridges</title>
+          <para>Select the <literal>Bridges</literal> option, then click
+          <literal>Add</literal>.</para>
+        </listitem>
+      </orderedlist>
-            <mediaobject>
+      <note>
-              <imageobject>
+        <para>Depending on the settings in <literal>Configuration -&gt;
-                <imagedata align="center" contentwidth="600"
+        OpenVSwitch -&gt; DPDK</literal>, OVS bridges with or without DPDK
-                           fileref="images/ovs_bridges_tab.png" />
+        support will be used on the uCPE device.</para>
-              </imageobject>
+      </note>
-            </mediaobject>
-          </figure>
-          <para><emphasis role="bold">How to add OVS bridges in the uCPE
+      <para>There are three types of bridges which can be created, each one
-          Manager</emphasis></para>
+      fulfiling a different role.</para>
-          <orderedlist>
+      <section id="inband_mg_bridge">
-            <listitem>
+        <title>uCPE In-band Management bridge</title>
-              <para>Select the uCPE device.</para>
-            </listitem>
-            <listitem>
+        <para>In-band Management refers to a model where both the data plane
-              <para>Select <literal>Configuration</literal>.</para>
+        and control plane flow over the same network path. In some situations
-            </listitem>
+        (e.g. the uCPE device has only one routable IP address), this is the
+        only option available to both control and configure the uCPE device,
+        while also allowing for data-path traffic to pass over the same
+        physical interface.</para>
-            <listitem>
+        <para>The solution provided by Enea for in-band management is based
-              <para>Click <literal>OpenvSwitch</literal>.</para>
+        upon an OpenvSwitch bridge managing all traffic passing through the
-            </listitem>
+        WAN physical port. Any standard or DPDK-assigned network interface can
+        be used for the In-Band management bridge.</para>
-            <listitem>
+        <para>To create the In-Band Management bridge, the user must set
-              <para>Select the <literal>Bridges</literal> option, then click
+        values for the following fields:</para>
-              <literal>Add</literal>.</para>
-            </listitem>
-          </orderedlist>
-          <note>
+        <itemizedlist>
-            <para>Depending on the settings in <literal>Configuration -&gt;
+          <listitem>
-            OpenVSwitch -&gt; DPDK</literal>, OVS bridges with or without DPDK
+            <para>name: name of the bridge.</para>
-            support will be used on the uCPE device.</para>
+          </listitem>
-          </note>
-          <para>There are three types of bridges which can be created, each
+          <listitem>
-          one fulfiling a different role.</para>
+            <para>ovs-bridge-type: inbandMgmt</para>
+          </listitem>
+        </itemizedlist>
+      </section>
-          <section id="inband_mg_bridge">
+      <section id="inband_mg_br_vnfs">
-            <title>uCPE In-band Management bridge</title>
+        <title>In-band Management bridge for VNFs</title>
-            <para>In-band Management refers to a model where both the data
+        <para>If VNF management can be done over a dedicated virtual
-            plane and control plane flow over the same network path. In some
+        interface, its possible to extend the networking infrastructure
-            situations (e.g. the uCPE device has only one routable IP
+        configuration to also access the VNF's management interface over the
-            address), this is the only option available to both control and
+        WAN port.</para>
-            configure the uCPE device, while also allowing for data-path
-            traffic to pass over the same physical interface.</para>
-            <para>The solution provided by Enea for in-band management is
+        <para>For this setup, three types of traffic will pass over the WAN
-            based upon an OpenvSwitch bridge fielding all traffic passing
+        physical interface:</para>
-            through the WAN physical port. Any standard or DPDK-assigned
-            network interface can be used for the In-Band management
+        <itemizedlist>
-            bridge.</para>
+          <listitem>
+            <para><emphasis role="bold">Device management</emphasis>. Part of
+            the device configuration done by the Enea uCPE Manager.</para>
+          </listitem>
+          <listitem>
+            <para><emphasis role="bold">VNF(s) management</emphasis>. Enabling
+            or disabling features of a VNF. E.g. enabling/disabling the
+            firewall or VPN setup.</para>
+          </listitem>
+          <listitem>
+            <para><emphasis role="bold">Data-path</emphasis>. All other
+            traffic that is not used in the control plane and needs to reach a
+            LAN network.</para>
+          </listitem>
+        </itemizedlist>
+        <para>To create a VNF In-Band Management bridge, the user must set
+        values for the following fields:</para>
+        <itemizedlist>
+          <listitem>
+            <para>name: name of the bridge.</para>
+          </listitem>
+          <listitem>
+            <para>ovs-bridge-type: vnfMgmt</para>
+          </listitem>
+          <listitem>
+            <para>vnf-mgmt-address: select IPv4 as the type and fill in an
+            internal IP address for the bridge interface that will be
+            connected to the VNF management network, e.g 10.0.0.1.</para>
+          </listitem>
+        </itemizedlist>
+        <note>
+          <para>VNF management interfaces must be configured in same subnet as
+          that used by the bridge interface connected to the VNF management
+          network.</para>
+        </note>
+      </section>
+      <section id="dataplane_bridge">
+        <title>Data-plane Bridge</title>
+        <para>Data-plane bridges are generic bridges used for the VNF
+        data-plane. There are two supported sub-types:</para>
+        <itemizedlist>
+          <listitem>
+            <para><emphasis role="bold">communication</emphasis>: allows for
+            VNF communication towards LAN/WAN networks. This bridge type has
+            at least one physical port attached to it.</para>
+          </listitem>
+          <listitem>
+            <para><emphasis role="bold">integration</emphasis>: allows for
+            VNF-to-VNF communication (usually for service function chaining).
+            This bridge type does not have any physical port attached.</para>
+          </listitem>
+        </itemizedlist>
-            <note>
+        <para>To create a Data-plane bridge, the user must set values for the
-              <para>The In-band Management bridge must be recreated each time
+        following fields:</para>
-              the uCPE Manager IP address is changed.</para>
-            </note>
+        <itemizedlist>
+          <listitem>
-            <para>To create the In-Band Management bridge, the user must set
+            <para>name: name of the bridge.</para>
-            values for the following fields:</para>
+          </listitem>
-            <itemizedlist>
+          <listitem>
-              <listitem>
+            <para>ovs-bridge-type: select <literal>communication</literal> or
-                <para>name: name of the bridge.</para>
+            <literal>integration</literal>, depending on intended usage. For
-              </listitem>
+            communication bridges, physical interfaces can be added to the
+            bridge.</para>
-              <listitem>
+          </listitem>
-                <para>ovs-bridge-type: inbandMgmt</para>
+        </itemizedlist>
-              </listitem>
-            </itemizedlist>
-            <note>
-              <para>The first VNF instantiated on the uCPE device must be
-              connected to the In-Band Management bridge and its WAN interface
-              must be configured as the DHCP client.</para>
-            </note>
-          </section>
-          <section id="inband_mg_br_vnfs">
-            <title>In-band Management bridge for VNFs</title>
-            <para>If VNF management can be done over a dedicated virtual
-            interface, its possible to extend the networking infrastructure
-            configuration to also access the VNF's management interface over
-            the WAN port.</para>
-            <para>For this setup, three types of traffic will pass over the
-            WAN physical interface:</para>
-            <itemizedlist>
-              <listitem>
-                <para><emphasis role="bold">Device management</emphasis>. Part
-                of the device configuration done by the uCPE Manager.</para>
-              </listitem>
-              <listitem>
-                <para><emphasis role="bold">VNF(s) management</emphasis>.
-                Enabling or disabling features of a VNF. E.g.
-                enabling/disabling the firewall or VPN setup.</para>
-              </listitem>
-              <listitem>
-                <para><emphasis role="bold">Data-path</emphasis>. All other
-                traffic that is not used in the control plane and needs to
-                reach a LAN network.</para>
-              </listitem>
-            </itemizedlist>
-            <para>To create a VNF In-Band Management bridge, the user must set
-            values for the following fields:</para>
-            <itemizedlist>
-              <listitem>
-                <para>name: name of the bridge.</para>
-              </listitem>
-              <listitem>
-                <para>ovs-bridge-type: vnfMgmt</para>
-              </listitem>
-              <listitem>
-                <para>vnf-mgmt-address: select IPv4 as the type and fill in
-                the IP address for management network, e.g 10.0.0.1.</para>
-              </listitem>
-            </itemizedlist>
-            <note>
-              <para>VNF management interfaces must be configured in same
-              network as the <literal>vnf-mgmt-address</literal> of the
-              bridge.</para>
-            </note>
-          </section>
-          <section id="dataplane_bridge">
-            <title>Data-plane Bridge</title>
-            <para>Data-plane bridges are generic bridges used for the VNF
-            data-plane. There are two supported sub-types:</para>
-            <itemizedlist>
-              <listitem>
-                <para><emphasis role="bold">communication</emphasis>: allows
-                for VNF communication towards LAN/WAN networks. This bridge
-                type has at least one physical port attached to it.</para>
-              </listitem>
-              <listitem>
-                <para><emphasis role="bold">integration</emphasis>: allows for
-                VNF-to-VNF communication (usually for service function
-                chaining). This bridge type does not have any physical port
-                attached.</para>
-              </listitem>
-            </itemizedlist>
-            <para>To create a Data-plane bridge, the user must set values for
-            the following fields:</para>
-            <itemizedlist>
-              <listitem>
-                <para>name: name of the bridge.</para>
-              </listitem>
-              <listitem>
-                <para>ovs-bridge-type: select <literal>communication</literal>
-                or <literal>integration</literal>, depending on intended
-                usage. For communication bridges, physical interfaces can be
-                added to the bridge.</para>
-              </listitem>
-            </itemizedlist>
-          </section>
-        </section>
      </section>
+    </section>
+  </section>
+  <section id="zero_touch_prov">
+    <title>Zero Touch Provisioning - Creating an offline configuration</title>
+    <para>Zero-Touch Provisioning (ZTP) refers to the process of when a device
+    starts up for the first time and its initial configuration is pushed down
+    by an external management system, so that it is setup for proper operation
+    without additional manual intervention by an operator. ZTP is an
+    alternative to Manual configuration.</para>
+    <para>A variety of operations can occur as part of ZTP such as initial
+    device setup, configuration of managed objects, etc. The goal is to set up
+    a device to the maximum possible extent without forcing an operator to be
+    physically present (initially) to manage the device.</para>
+    <para>An offline configuration is usually prepared in advance for the Enea
+    uCPE Manager to setup the virtualization infrastructure on the uCPE
+    device, as soon as a device enrolls into the management system.</para>
+    <section id="offline_configuration">
+      <title>Offline Configuration</title>
-      <section id="zero_touch_prov">
+      <para>The Offline Configuration subsystem is used to pre-populate a
-        <title>Zero Touch Provisioning - Creating an offline
+      configuration for a device that will be brought under management at a
-        configuration</title>
+      future point in time. When creating an offline configuration store a
+      <literal>Device ID</literal> can be specified. This ID uniquely
-        <para>Zero-Touch Provisioning (ZTP) refers to the process of when a
+      identifies the device to be initialized.</para>
-        device starts up for the first time and its initial configuration is
-        pushed down by an external management system, so that it is setup for
+      <para>Alternatively, a wildcard can be used in the <literal>Device
-        proper operation without additional manual intervention by an
+      ID</literal> field, which results in a configuration being pushed on all
-        operator. ZTP is an alternative to Manual configuration.</para>
+      uCPE devices upon their initial connection towards the Enea uCPE
+      Manager.</para>
-        <para>A variety of operations can occur as part of ZTP such as initial
-        device setup, configuration of managed objects, etc. The goal is to
+      <para>If the offline configuration is not configured for a uCPE device,
-        set up a device to the maximum possible extent without forcing an
+      an alarm will be raised: <literal>Day-0 Config:ZTP:Major</literal>,
-        operator to be physically present (initially) to manage the
+      which occurs when the uCPE device connects to the Enea uCPE Manager
-        device.</para>
+      informing that the ZTP setup failed for the specific uCPE device.</para>
-        <para>An offline configuration is usually prepared in advance for the
+      <para>To create an offline configuration, from the top toolbar menu
-        uCPE Manager to setup the virtualization infrastructure on the uCPE
+      select <literal>Applications</literal> -&gt; <literal>Offline
-        device, as soon as a device enrolls into the management system.</para>
+      Config</literal> -&gt; <literal>Add</literal>. The following fields
+      should be filled:</para>
-        <section id="offline_configuration">
-          <title>Offline Configuration</title>
+      <itemizedlist>
+        <listitem>
-          <para>The Offline Configuration subsystem is used to pre-populate a
+          <para>Name: name of the device.</para>
-          configuration for a device that will be brought under management at
+        </listitem>
-          a future point in time. When creating an offline configuration store
-          a <literal>Device ID</literal> can be specified. This ID uniquely
+        <listitem>
-          identifies the device to be initialized.</para>
+          <para>Device type: Enea universal CPE.</para>
+        </listitem>
-          <para>Alternatively, a wildcard can be used in the <literal>Device
-          ID</literal> field, which results in a configuration being pushed on
+        <listitem>
-          all uCPE devices upon their initial connection towards the uCPE
+          <para>DeviceVersion: <xi:include
-          Manager.</para>
+          href="../../s_doceneacommon/doc/eltf_params_updated.xml"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
-          <para>If the offline configuration is not configured for a uCPE
+          xpointer="element(EneaLinux_REL_VER/1)" /></para>
-          device, an alarm will be raised: <literal>Day-0
+        </listitem>
-          Config:ZTP:Major</literal>, which occurs when the uCPE device
-          connects to the uCPE Manager informing that the ZTP setup failed for
+        <listitem>
-          the specific uCPE device.</para>
+          <para>Config Set: uCPE Config</para>
+        </listitem>
-          <para>To create an offline configuration, from the top toolbar menu
-          select <literal>Applications</literal> -&gt; <literal>Offline
+        <listitem>
-          Config</literal> -&gt; <literal>Add</literal>. The following fields
+          <para>Device ID: device ID or a wildcard(*).</para>
-          should be filled:</para>
+        </listitem>
-          <itemizedlist>
+        <listitem>
-            <listitem>
+          <para>Device Grouping Tags: a tag to group devices. These tags match
-              <para>Name: name of the device.</para>
+          the customer tags provided during the installation of the
-            </listitem>
-            <listitem>
-              <para>Device type: Enea universal CPE.</para>
-            </listitem>
-            <listitem>
-              <para>DeviceVersion: <xi:include
-              href="../../s_doceneacommon/doc/eltf_params_updated.xml"
-              xmlns:xi="http://www.w3.org/2001/XInclude"
-              xpointer="element(EneaLinux_REL_VER/1)" /></para>
-            </listitem>
-            <listitem>
-              <para>Config Set: uCPE Config</para>
-            </listitem>
-            <listitem>
-              <para>Device ID: device ID or a wildcard(*).</para>
-            </listitem>
-            <listitem>
-              <para>Device Grouping Tags: a tag to group devices. These tags
-              match the customer tags provided during the installation of the
-              device.</para>
-            </listitem>
-          </itemizedlist>
-          <para>The Name is user defined and can be set to any unique text
-          string identifying the configuration. The Device Version will match
-          the Enea NFV Access version of the uCPE device and the Device ID
-          will be set to the previously set identifier of the uCPE
          device.</para>
+        </listitem>
+      </itemizedlist>
+      <para>The Name is user defined and can be set to any unique text string
+      identifying the configuration. The Device Version will match the Enea
+      NFV Access version of the uCPE device and the Device ID will be set to
+      the previously set identifier of the uCPE device.</para>
+      <para>When a device connects to the Enea uCPE Manager for the first
+      time, it checks the device to see if it has been Zero Touch Provisioned
+      (ZTP). If not, it looks for an offline configuration that matches these
+      values, in the following order:</para>
+      <itemizedlist>
+        <listitem>
+          <para>The Device ID.</para>
+        </listitem>
+        <listitem>
+          <para>The set of tags.</para>
+        </listitem>
-          <para>When a device connects to the uCPE Manager for the first time,
+        <listitem>
-          it checks the device to see if it has been Zero Touch Provisioned
+          <para>A "*" for Device ID (wildcard).</para>
-          (ZTP). If not, it looks for an offline configuration that matches
+        </listitem>
-          these values, in the following order:</para>
+      </itemizedlist>
+      <para>If a match is found, the offline configuration is sent to the
+      device as part of Zero-Touch-Provisioning.</para>
+      <para>After creating the Offline Config Store, access the device through
+      <literal>Applications</literal> -&gt; <literal>offline config</literal>
+      -&gt; <literal>Config App</literal> and provision it with the required
+      initial configuration. This operation mirrors what happens during manual
+      configuration described previously.</para>
+      <note>
+        <para>The ZTP will only be triggered the first time a uCPE device
+        connects to the Enea uCPE Manager. Just changing an offline
+        configuration will not push the new changes to the device. If an
+        offline configuration is changed after uCPE device registration, a
+        factory reset can be executed to force a new ZTP to execute by
+        selecting the device, then <literal>Operations</literal> -&gt;
+        <literal>factory reset</literal>.</para>
+      </note>
+    </section>
+  </section>
+  <section id="custom_scripts">
+    <title>Custom Scripts for Custom Networking Configurations</title>
+    <para>The custom scripts feature allows users to execute user-defined
+    scripts on the uCPE device at various times.This allows for more flexible
+    and advanced configurations such as a LTE modem configuration, advanced
+    network configurations or OVS flow rule programming at any time.</para>
+    <section id="upload_scripts">
+      <title>Uploading Scripts</title>
-          <itemizedlist>
+      <para>The scripts need to be uploaded to the Enea uCPE Manager prior to
-            <listitem>
+      use. When uploading scripts to the Enea uCPE Manager make sure to select
-              <para>The Device ID.</para>
+      the right script type.</para>
-            </listitem>
-            <listitem>
+      <para>The following script types are supported:</para>
-              <para>The set of tags.</para>
-            </listitem>
-            <listitem>
+      <itemizedlist>
-              <para>A "*" for Device ID (wildcard).</para>
+        <listitem>
-            </listitem>
+          <para><literal>Once-before-startup</literal>. This script will only
-          </itemizedlist>
+          execute once during the startup.</para>
+        </listitem>
-          <para>If a match is found, the offline configuration is sent to the
+        <listitem>
-          device as part of Zero-Touch-Provisioning.</para>
+          <para><literal>Always-before-startup</literal>. This script will
+          always execute during the startup.</para>
+        </listitem>
-          <para>After creating the Offline Config Store, access the device
+        <listitem>
-          through <literal>Applications</literal> -&gt; <literal>offline
+          <para><literal>Once-after-startup</literal>. This script will only
-          config</literal> -&gt; <literal>Config App</literal> and provision
+          execute once after the system has been started.</para>
-          it with the required initial configuration. This operation mirrors
+        </listitem>
-          what happens during manual configuration described
-          previously.</para>
+        <listitem>
+          <para><literal>Always-after-startup</literal>. This script will
+          always execute after the system has been started.</para>
+        </listitem>
+      </itemizedlist>
+      <para>Follow the instruction below to upload scripts:</para>
+      <orderedlist>
+        <listitem>
+          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
+          Scripts</literal> -&gt; <literal>Configure</literal>.</para>
+        </listitem>
+        <listitem>
+          <para>Select <literal>Upload to EMS</literal>.</para>
+        </listitem>
+        <listitem>
+          <para>In the <literal>Script Type</literal> menu, select the type
+          the uploaded script should have.</para>
+        </listitem>
+        <listitem>
+          <para>Press <literal>Choose File</literal> to select the scripts
+          needed, and then press <literal>Send</literal>.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+    <section id="remove_scripts">
+      <title>Removing Scripts</title>
+      <para>Follow the instruction below to remove scripts:</para>
+      <orderedlist>
+        <listitem>
+          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
+          Scripts</literal> -&gt; <literal>Configure</literal>.</para>
+        </listitem>
+        <listitem>
+          <para>Select the script you want to delete from the
+          <literal>Uploaded Scripts</literal> tab and then click
+          <literal>Delete</literal>, which will remove the script immediately
+          from the Enea uCPE Manager.</para>
+        </listitem>
+      </orderedlist>
+    </section>
+    <section id="configure_scripts">
+      <title>Configuring Script Location</title>
+      <para>The location where the scripts are staged in the Enea uCPE Manager
+      can be chanaged as described below:</para>
+      <orderedlist>
+        <listitem>
+          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
+          Scripts</literal> -&gt; <literal>Configure</literal>.</para>
+        </listitem>
+        <listitem>
+          <para>Select the <literal>Configuration</literal> tab and specify a
+          new loacation to store the scripts.</para>
          <note>
-            <para>The ZTP will only be triggered the first time a uCPE device
+            <para>Change the script storage location only if you have many
-            connects to the uCPE Manager. Just changing an offline
+            scripts which you would prefer to store on another partition,
-            configuration will not push the new changes to the device. If an
+            otherwise leave this configuration as is.</para>
-            offline configuration is changed after uCPE device registration, a
-            factory reset can be executed to force a new ZTP to execute by
-            selecting the device, then <literal>Operations</literal> -&gt;
-            <literal>factory reset</literal>.</para>
          </note>
-        </section>
+        </listitem>
-      </section>
+      </orderedlist>
+    </section>
-      <section id="custom_scripts">
+    <section id="run_the_scripts">
-        <title>Custom Scripts for Custom Networking Configurations</title>
+      <title>Running the Scripts</title>
-        <para>The custom scripts feature allows users to execute user-defined
+      <para><emphasis role="bold">How to run Custom Scripts</emphasis></para>
-        scripts on the uCPE device at various times.This allows for more
-        flexible and advanced configurations such as a LTE modem
+      <orderedlist>
-        configuration, advanced network configurations or OVS flow rule
+        <listitem>
-        programming at any time.</para>
+          <para>Select <literal>Devices</literal> -&gt; <literal>Custom
+          Scripts</literal> -&gt; <literal>Apply Scripts</literal>.</para>
-        <section id="upload_scripts">
+        </listitem>
-          <title>Uploading Scripts</title>
+        <listitem>
-          <para>The scripts need to be uploaded to the uCPE Manager prior to
+          <para>In the <literal>Script Config Screen</literal> pop up, select
-          use. When uploading scripts to the uCPE Manager make sure to select
+          the devices from the device(s) chooser list on which to run the
-          the right script type.</para>
+          scripts. Press the <literal>&gt;</literal> button to move the
+          devices to the right side of the chooser, which is the list of
-          <para>The following script types are supported:</para>
+          devices that will execute the selected scripts.</para>
+        </listitem>
-          <itemizedlist>
-            <listitem>
+        <listitem>
-              <para><literal>Once-before-startup</literal>. This script will
+          <para>Select the scripts from the list under the device(s) chooser
-              only execute once during the startup.</para>
+          by pressing the <literal>+</literal> button.</para>
-            </listitem>
+        </listitem>
-            <listitem>
+        <listitem>
-              <para><literal>Always-before-startup</literal>. This script will
+          <para>In the pop-up window, select the scripts from the list. If
-              always execute during the startup.</para>
+          there are no scripts to select, then there is no script uploaded
-            </listitem>
+          with that particular type. Upload the script(s) needed and try
+          again.</para>
-            <listitem>
+        </listitem>
-              <para><literal>Once-after-startup</literal>. This script will
-              only execute once after the system has been started.</para>
+        <listitem>
-            </listitem>
+          <para>Check the checkbox <literal>Reboot devices</literal> if you
+          want to reboot and execute the scripts at once and then press
-            <listitem>
+          <literal>ok</literal>.</para>
-              <para><literal>Always-after-startup</literal>. This script will
-              always execute after the system has been started.</para>
+          <note>
-            </listitem>
+            <para>The status of execution for the scripts can be seen by
-          </itemizedlist>
+            opening the <literal>Fault</literal> -&gt;
+            <literal>Events</literal> screen and filtering by device and/or
-          <para>Follow the instruction below to upload scripts:</para>
+            the event name <filename>Custom</filename>.</para>
+          </note>
-          <orderedlist>
+        </listitem>
-            <listitem>
+      </orderedlist>
-              <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-              Scripts</literal> -&gt; <literal>Configure</literal>.</para>
-            </listitem>
-            <listitem>
-              <para>Select <literal>Upload to EMS</literal>.</para>
-            </listitem>
-            <listitem>
-              <para>In the <literal>Script Type</literal> menu, select the
-              type the uploaded script should have.</para>
-            </listitem>
-            <listitem>
-              <para>Press <literal>Choose File</literal> to select the scripts
-              needed, and then press <literal>Send</literal>.</para>
-            </listitem>
-          </orderedlist>
-        </section>
-        <section id="remove_scripts">
-          <title>Removing Scripts</title>
-          <para>Follow the instruction below to remove scripts:</para>
-          <orderedlist>
-            <listitem>
-              <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-              Scripts</literal> -&gt; <literal>Configure</literal>.</para>
-            </listitem>
-            <listitem>
-              <para>Select the script you want to delete from the
-              <literal>Uploaded Scripts</literal> tab and then click
-              <literal>Delete</literal>, which will remove the script
-              immediately from the uCPE Manager.</para>
-            </listitem>
-          </orderedlist>
-        </section>
-        <section id="configure_scripts">
-          <title>Configuring Script Location</title>
-          <para>The location where the scripts are staged in the uCPE Manager
-          can be chanaged as described below:</para>
-          <orderedlist>
-            <listitem>
-              <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-              Scripts</literal> -&gt; <literal>Configure</literal>.</para>
-            </listitem>
-            <listitem>
-              <para>Select the <literal>Configuration</literal> tab and
-              specify a new loacation to store the scripts.</para>
-              <note>
-                <para>Change the script storage location only if you have many
-                scripts which you would prefer to store on another partition,
-                otherwise leave this configuration as is.</para>
-              </note>
-            </listitem>
-          </orderedlist>
-        </section>
-        <section id="run_the_scripts">
-          <title>Running the Scripts</title>
-          <para><emphasis role="bold">How to run Custom
-          Scripts</emphasis></para>
-          <orderedlist>
-            <listitem>
-              <para>Select <literal>Devices</literal> -&gt; <literal>Custom
-              Scripts</literal> -&gt; <literal>Apply Scripts</literal>.</para>
-            </listitem>
-            <listitem>
-              <para>In the <literal>Script Config Screen</literal> pop up,
-              select the devices from the device(s) chooser list on which to
-              run the scripts. Press the <literal>&gt;</literal> button to
-              move the devices to the right side of the chooser, which is the
-              list of devices that will execute the selected scripts.</para>
-            </listitem>
-            <listitem>
-              <para>Select the scripts from the list under the device(s)
-              chooser by pressing the <literal>+</literal> button.</para>
-            </listitem>
-            <listitem>
-              <para>In the pop-up window, select the scripts from the list. If
-              there are no scripts to select, then there is no script uploaded
-              with that particular type. Upload the script(s) needed and try
-              again.</para>
-            </listitem>
-            <listitem>
-              <para>Check the checkbox <literal>Reboot devices</literal> if
-              you want to reboot and execute the scripts at once and then
-              press <literal>ok</literal>.</para>
-              <note>
-                <para>The status of execution for the scripts can be seen by
-                opening the <literal>Fault</literal> -&gt;
-                <literal>Events</literal> screen and filtering by device
-                and/or the event name <filename>Custom</filename>.</para>
-              </note>
-            </listitem>
-          </orderedlist>
-        </section>
-      </section>
    </section>
  </section>
 </chapter>
 \ No newline at end of file
diff --git a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml b/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
index 9bf8822..e176cec 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
@@ -2,17 +2,17 @@
 <chapter id="troubleshooting">
  <title>Troubleshooting and Recovery</title>
-  <para>The following is a small list of possible NFV Access problems, and
+  <para>The following is a small list of possible Enea NFV Access problems,
-  their solutions. <emphasis role="bold">In all scenarios collect the logs if
+  and their solutions. <emphasis role="bold">In all scenarios collect the logs
-  possible for debugging.</emphasis> More information on log collecting can be
+  if possible for debugging.</emphasis> More information on log collecting can
-  found in <olink targetdoc="book_enea_nfv_access_getting_started"
+  be found in <olink targetdoc="book_enea_nfv_access_getting_started"
  targetptr="log_collector">Using the Log Collector in the <xi:include
  href="../../s_docbuild/olinkdb/pardoc-names.xml"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
  Manual.</para>
-  <para>If you encounter other issues or can't get NFV Access to work
+  <para>If you encounter other issues or can't get Enea NFV Access to work
  successfully after consulting the information below, please use the <olink
  targetdoc="book_enea_nfv_access_release_info"
  targetptr="contacting_enea_support">Enea Support team Form, available in the
@@ -29,7 +29,7 @@
      <thead>
        <row>
-          <entry align="center">NFV Access Problem</entry>
+          <entry align="center">Enea NFV Access Problem</entry>
          <entry align="center">Solution</entry>
        </row>
@@ -37,13 +37,30 @@
      <tbody>
        <row>
+          <entry>A uCPE device fails to connect to the Enea uCPE Manager after
+          installation.</entry>
+          <entry>If the uCPE device is not able to connect to the Enea uCPE
+          Manager after an installation, the Web-installer application is
+          started automatically on the uCPE device to change the configuration
+          via a web browser. Please see <olink
+          targetdoc="book_enea_nfv_access_getting_started"
+          targetptr="boot_device_add_map">Booting the uCPE device and adding
+          it to the Map in the <xi:include
+          href="../../s_docbuild/olinkdb/pardoc-names.xml"
+          xmlns:xi="http://www.w3.org/2001/XInclude"
+          xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
+          Manual.</entry>
+        </row>
+        <row>
          <entry>The uCPE Device cannot boot after an upgrade.</entry>
          <entry><orderedlist>
              <listitem>
                <para>Perform a hardware reboot of the uCPE Device and select
-                the previous NFV Access image from the GRUB menu. This action
+                the previous Enea NFV Access image from the GRUB menu. This
-                assumes physical access to the uCPE device.</para>
+                action assumes physical access to the uCPE device.</para>
              </listitem>
              <listitem>
@@ -60,10 +77,10 @@
        </row>
        <row>
-          <entry>After a failed uCPE device upgrade the previous NFV Access
+          <entry>After a failed uCPE device upgrade the previous Enea NFV
-          image (from the GRUB menu) does not boot.</entry>
+          Access image (from the GRUB menu) does not boot.</entry>
-          <entry>Reinstall NFV Access on the uCPE device and redeploy the
+          <entry>Reinstall Enea NFV Access on the uCPE device and redeploy the
          initial configuration and virtualized services, by following the
          steps in <olink targetdoc="book_enea_nfv_access_getting_started"
          targetptr="install_ena_device">Installing Enea NFV Access - uCPE
@@ -75,7 +92,7 @@
        </row>
        <row>
-          <entry>The uCPE Manager upgrade fails and a working snapshot is
+          <entry>The Enea uCPE Manager upgrade fails and a working snapshot is
          available.</entry>
          <entry>If a working snapshot obtained during a previous Upgrade or
@@ -102,8 +119,8 @@
        </row>
        <row>
-          <entry>The uCPE Manager upgrade fails and no working snapshot is
+          <entry>The Enea uCPE Manager upgrade fails and no working snapshot
-          available, but a System Back-up file exists.</entry>
+          is available, but a System Back-up file exists.</entry>
          <entry><orderedlist>
              <listitem>
@@ -114,8 +131,8 @@
              <listitem>
                <para>Perform an installation with the restore option of a
-                previous uCPE Manager configuration as described in <olink
+                previous Enea uCPE Manager configuration as described in
-                targetdoc="book_enea_nfv_access_getting_started"
+                <olink targetdoc="book_enea_nfv_access_getting_started"
                targetptr="install_ucpemg_from_backup">Installation of the
                uCPE Manager using a System Back-up in the <xi:include
                href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -128,7 +145,7 @@
        <row>
          <entry>The uCPE device is booted, the ssh connection is available
-          but the device is not connected to the uCPE Manager.</entry>
+          but the device is not connected to the Enea uCPE Manager.</entry>
          <entry><orderedlist>
              <listitem>
@@ -138,7 +155,7 @@
              <listitem>
                <para>Use the <literal>Reconnect</literal> button from the
-                uCPE Manager's GUI.</para>
+                Enea uCPE Manager's GUI.</para>
              </listitem>
              <listitem>
@@ -190,7 +207,7 @@
              <listitem>
                <para>Reboot the device using <literal>Operations</literal>
                -&gt; <literal>Reboot</literal> menu options from within the
-                uCPE Manager.</para>
+                Enea uCPE Manager.</para>
              </listitem>
              <listitem>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml b/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
index 0876709..3706548 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="upgrade_ena">
-  <title>Upgrading NFV Access</title>
+  <title>Upgrading Enea NFV Access</title>
-  <para>Enea provides regular releases that will require the upgrading of NFV
+  <para>Enea provides regular releases that will require the upgrading of Enea
-  Access components. The uCPE Manager must be upgraded to the new Enea NFV
+  NFV Access components. The Enea uCPE Manager must be upgraded first,
-  Access version before the uCPE devices are.</para>
+  followed by upgrading Enea NFV Access Run Time on the uCPE devices.</para>
  <section id="upgrade_mg">
-    <title>Upgrading the uCPE Manager</title>
+    <title>Upgrading the Enea uCPE Manager</title>
    <note>
      <para>It is recommended to create a system backup by accessing:
      <literal>System</literal> -&gt; <literal>System Backup</literal> from
-      the uCPE Manager GUI, for recovery in case of an upgrade failure.</para>
+      the Enea uCPE Manager GUI, for recovery in case of an upgrade
+      failure.</para>
    </note>
    <orderedlist>
@@ -31,7 +32,7 @@
      <listitem>
        <para>Run the following command with the root account and change
-        <literal>/opt/ems</literal> to the correct location of the uCPE
+        <literal>/opt/ems</literal> to the correct location of the Enea uCPE
        Manager installation:</para>
        <programlisting>./upgrade.sh /opt/ems \
@@ -55,7 +56,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        <note>
          <para>The snapshot file created during the upgrade can be used for
-          restoring the uCPE Manager.</para>
+          restoring the Enea uCPE Manager.</para>
        </note>
      </listitem>
@@ -70,9 +71,9 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
    </itemizedlist>
    <section id="restore_prev_ucpe_install">
-      <title>Restoring a previous uCPE Manager installation</title>
+      <title>Restoring a previous Enea uCPE Manager installation</title>
-      <para><emphasis role="bold">How to restore a previous uCPE Manager
+      <para><emphasis role="bold">How to restore a previous Enea uCPE Manager
      installation</emphasis></para>
      <orderedlist>
@@ -89,8 +90,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        <listitem>
          <para>Copy the snapshot file
          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>)
-          created during a previous uCPE Manager Upgrade or uCPE Manager
+          created during a previous Enea uCPE Manager Upgrade or Enea uCPE
-          Uninstall Operation into the
+          Manager Uninstall Operation into the
          <literal>&lt;uCPEM-installdir&gt;</literal> directory.</para>
        </listitem>
@@ -100,7 +101,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        <listitem>
          <para>Run the following command with the root user and change
-          <literal>/opt/ems</literal> to the correct location of the uCPE
+          <literal>/opt/ems</literal> to the correct location of the Enea uCPE
          Manager installation:</para>
          <programlisting>./restore.sh /opt/ems ucpemanager-Backup-YYYYddMMHHmm.tar.gz</programlisting>
@@ -116,8 +117,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        </listitem>
        <listitem>
-          <para>Reinstall the uCPE Manager application on the specified target
+          <para>Reinstall the Enea uCPE Manager application on the specified
-          location, restoring the data in the database and files in the
+          target location, restoring the data in the database and files in the
          process.</para>
        </listitem>
      </itemizedlist>
@@ -127,20 +128,20 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
    </section>
    <section id="uninstall_ucpem_install">
-      <title>Uninstalling an existing uCPE Manager installation</title>
+      <title>Uninstalling an existing Enea uCPE Manager installation</title>
-      <para><emphasis role="bold">How to uninstall an existing uCPE Manager
+      <para><emphasis role="bold">How to uninstall an existing Enea uCPE
-      installation</emphasis></para>
+      Manager installation</emphasis></para>
      <orderedlist>
        <listitem>
-          <para>Navigate to the folder where the uCPE Manager is installed:
+          <para>Navigate to the folder where the Enea uCPE Manager is
-          <filename>&lt;uCPEM-installdir&gt;</filename>.</para>
+          installed: <filename>&lt;uCPEM-installdir&gt;</filename>.</para>
        </listitem>
        <listitem>
          <para>Run the following command with the root user and change
-          <literal>/opt/ems</literal> to the correct location of the uCPE
+          <literal>/opt/ems</literal> to the correct location of the Enea uCPE
          Manager installation:</para>
          <programlisting>./uninstall.sh /opt/ems</programlisting>
@@ -164,7 +165,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
          <note>
            <para>The snapshot file created during the uninstall can be used
-            for restoring the uCPE Manager.</para>
+            for restoring the Enea uCPE Manager.</para>
          </note>
        </listitem>
@@ -183,15 +184,16 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
        </listitem>
      </itemizedlist>
-      <para>After these steps, the uCPE Manager is completely removed from the
+      <para>After these steps, the Enea uCPE Manager is completely removed
-      system.</para>
+      from the system.</para>
    </section>
  </section>
  <section id="upgrade_devices">
    <title>uCPE device upgrades</title>
-    <para>A uCPE device can be upgraded using the uCPE Manager GUI.</para>
+    <para>A uCPE device can be upgraded using the Enea uCPE Manager
+    GUI.</para>
    <section id="device_up_process">
      <title>The uCPE device upgrade process</title>
@@ -251,7 +253,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
      <note>
        <para>The uCPE Device upgrade is done with image files of type
        <literal>rootfs.ostree.tar.bz2</literal>, which are available in the
-        <filename>Enea_NFV_Ac-cess_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
+        <filename>Enea_NFV_Access_Run_Time_Platform_&lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
        file you downloaded with your release.</para>
      </note>
@@ -345,7 +347,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
            when to run the upgrade.</para>
            <note>
-              <para>The hour represents the local uCPE Manager server
+              <para>The hour represents the local Enea uCPE Manager server
              hour.</para>
            </note>
          </listitem>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml b/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
index 545bf99..dd90884 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
@@ -35,8 +35,8 @@
          <note>
            <para>There are no standard ways of managing VNF licenses,
            therefore no general guidelines can be provided. One example of
-            license handling that can be employed in the uCPE Manager is the
+            license handling that can be employed in the Enea uCPE Manager is
-            adding of a license during the Cloud-Init setup.</para>
+            the adding of a license during the Cloud-Init setup.</para>
          </note>
        </listitem>
@@ -109,10 +109,10 @@
    </section>
    <section id="onboard_in_ucpemg">
-      <title>Onboarding into the uCPE Manager</title>
+      <title>Onboarding into the Enea uCPE Manager</title>
-      <para><emphasis role="bold">How to onboard a VNF into the uCPE Manager
+      <para><emphasis role="bold">How to onboard a VNF into the Enea uCPE
-      </emphasis></para>
+      Manager </emphasis></para>
      <orderedlist>
        <listitem>
@@ -133,8 +133,8 @@
      <para>This window contains data fields where both necessary and optional
      information about the VNF can be supplied. After doing so, press the
-      Onboard button, the uCPE Manager will create the VNF descriptor and add
+      Onboard button, the Enea uCPE Manager will create the VNF descriptor and
-      it to its VNF Catalog.</para>
+      add it to its VNF Catalog.</para>
      <figure>
        <title>Onboard a VNF</title>
@@ -171,7 +171,7 @@
        <listitem>
          <para><emphasis role="bold">Description</emphasis>. This field
          contains any description provided and is only displayed in the GUI
-          tables in the uCPE Manager.</para>
+          tables in the Enea uCPE Manager.</para>
        </listitem>
        <listitem>
@@ -209,7 +209,7 @@
      <para>This table will contain the interfaces required by this VNF to be
      configured, when creating an instance. Consult the VNF vendor to
      determine which and how many are required. Each interface requires a
-      name, and optionally a description, used only by the uCPE
+      name, and optionally a description, used only by the Enea uCPE
      Manager.</para>
      <note>
@@ -219,8 +219,8 @@
      <para><emphasis role="bold">Cloud Init Tab</emphasis></para>
-      <para>Click the <literal>Clout Init</literal> tab to provide the
+      <para>Click the <literal>Cloud Init</literal> tab to provide the
-      Clout-Init configuration. There are three fields that need to be
+      Cloud-Init configuration. There are three fields that need to be
      populated:</para>
      <orderedlist>
@@ -271,9 +271,9 @@
          <para><emphasis role="bold">Content Files Table</emphasis></para>
          <para>The <literal>Content Files Table</literal> is ONLY used if
-          <literal>ConfigDrive</literal> is chosend as the Cloud-Init
+          <literal>ConfigDrive</literal> is chosen as the Cloud-Init
          Datasource. For each content file added, a <literal>Path</literal>
-          must be provided. When the uCPE Manager is used to create an
+          must be provided. When the Enea uCPE Manager is used to create an
          instance for multiple VNFs, the user will be prompted to provide a
          data file for each entry in this table. Each type of VNF will
          require different cloud-init files, e.g.: a license file. The data
@@ -291,10 +291,10 @@
      <para>In this table, you can enter values for properties that will be
      used during instantiation of the VNF. The values will augment the
-      default values in the <filename>Domain.XML</filename> file used by
+      default values in the <filename>domain.xml</filename> file used by
-      <literal>libvirt/virsh</literal> (running in NFV Access) when creating
+      <literal>libvirt/virsh</literal> (running in Enea NFV Access) when
-      an instance of the VNF. Consult with the VNF Vendor or ENEA support for
+      creating an instance of the VNF. Consult with the VNF Vendor or ENEA
-      values needed by specific VNFs.</para>
+      support for values needed by specific VNFs.</para>
      <para><emphasis role="bold">Property Values</emphasis></para>
@@ -437,25 +437,20 @@
          </listitem>
          <listitem>
-            <para>For reverse ssh connections: the <literal>Username</literal>
+            <para>For reverse ssh connections (ssh to a uCPE device behind
-            (default: root) and the <literal>Reverse ssh</literal> checkbox
+            NAT): the <literal>Username</literal> (default: root) and the
-            checked. The port will be automatically choosen by the uCPE
+            <literal>Reverse ssh</literal> checkbox checked. The port will be
-            Manager in the range defined in the <literal>System -&gt;
+            automatically choosen by the Enea uCPE Manager in the range
-            Configuration -&gt; Reverse SSH</literal> configuration panel. By
+            defined in the <literal>System -&gt; Configuration -&gt; Reverse
-            default, the start port will be <literal>7000</literal> and the
+            SSH</literal> configuration panel. By default, the start port will
-            maximum number of ports allocated to all devices is 10. Only one
+            be <literal>7000</literal> and the maximum number of ports
-            port per device is allowed.</para>
+            allocated to all devices is 10. Only one port per device is
+            allowed. </para>
-            <para>A SSH Tunnel between the uCPE Manager and the device will be
-            created:</para>
+            <para>When the SSH window is closed, the tunnel configuration is
+            deleted on the uCPE device and the tunnel is destroyed, so that
-            <programlisting>ssh -f -N -T -R &lt; Port &gt; :localhost:22 &lt;uCPE Mgr user&gt;@&lt;uCPE MgrIP&gt;</programlisting>
+            the port can be reused to establish a new tunnel when
+            needed.</para>
-            <para>The device must be connected to the uCPE Manager for the
-            tunnel to be created. On connection, a normal ssh connection will
-            be made:</para>
-            <programlisting>ssh -p &lt;Port&gt; &lt;Username&gt;@localhost</programlisting>
          </listitem>
        </itemizedlist>
      </listitem>
diff --git a/doc/book-enea-nfv-access-release-info/doc/about_release.xml b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
index d470415..a7c1c69 100644
--- a/doc/book-enea-nfv-access-release-info/doc/about_release.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
@@ -14,10 +14,10 @@
  href="../../s_doceneacommon/doc/eltf_params_updated.xml"
  xmlns:xi="http://www.w3.org/2001/XInclude"
  xpointer="element(EneaLinux_REL_VER/1)" /> Release includes a new version of
-  the major components as well as other features and optimizations, 
+  the major components as well as other features and optimizations, and
-    and documentation updates. A list of new features and improvements can be found in
+  documentation updates. A list of new features and improvements can be found
-  <xref linkend="relinfo-changes-other">Section 2.1 New
+  in <xref linkend="relinfo-changes-other">Section 2.1 New Features and
-  Features and Improvements</xref>.</para>
+  Improvements</xref>.</para>
  <section id="release-content">
    <title>Enea NFV Access Release Content</title>
@@ -107,8 +107,8 @@
        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
        xmlns:xi="http://www.w3.org/2001/XInclude"
        xpointer="element(book_enea_nfv_access_getting_started/1)" />.
-        Describes how to install the uCPE Manager, the NFV Access Run-Time
+        Describes how to install the Enea uCPE Manager, the Enea NFV Access
-        platform and Device Management.</para>
+        Run-Time platform and Device Management.</para>
      </listitem>
      <listitem>
diff --git a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
index 9b7ac80..e4c9764 100644
--- a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
@@ -9,8 +9,8 @@
  <itemizedlist>
    <listitem>
-      <para><remark>LXCR-9904</remark>NFV Access cannot be installed on USB
+      <para><remark>LXCR-9904</remark>Enea NFV Access cannot be installed on
-      storage devices.</para>
+      USB storage devices.</para>
    </listitem>
    <listitem>
@@ -19,9 +19,9 @@
    </listitem>
    <listitem>
-      <para><remark>ELCCR-527</remark>Cancelling a file upload in the uCPE
+      <para><remark>ELCCR-527</remark>Cancelling a file upload in the Enea
-      Manager will require the user to close and reopen the upload window for
+      uCPE Manager will require the user to close and reopen the upload window
-      the next upload to work.</para>
+      for the next upload to work.</para>
    </listitem>
    <listitem>
@@ -58,10 +58,10 @@
    <listitem>
      <para><remark>LXCR-9992</remark>Depending on hardware capabilities,
      there are certain limitations regarding the <literal>vfio-pci</literal>
-      and <literal>igb_uio</literal> drivers. While the NFV Access Run Time
+      and <literal>igb_uio</literal> drivers. While the Enea NFV Access Run
-      Platform uses the <literal>vfio-pci</literal> driver by default, for
+      Time Platform uses the <literal>vfio-pci</literal> driver by default,
-      certain hardware configurations, <literal>igb_uio</literal> should be
+      for certain hardware configurations, <literal>igb_uio</literal> should
-      used instead, by providing custom scripting. Please contact Enea for
+      be used instead, by providing custom scripting. Please contact Enea for
      further details.</para>
    </listitem>
@@ -77,11 +77,11 @@
    </listitem>
    <listitem>
-      <para><remark>ELCCR-912</remark>Adding an upgrade image into the uCPE
+      <para><remark>ELCCR-912</remark>Adding an upgrade image into the Enea
-      Manager (<literal>Device &gt; Upgrade &gt; Add</literal>) fails,
+      uCPE Manager (<literal>Device &gt; Upgrade &gt; Add</literal>) fails,
      producing the following error <literal>ostree: symbol lookup error:
      /usr/local/lib/libostree-1.so.1: undefined symbol:
-      g_utf8_make_valid</literal>. This occurs when the uCPE Manager is
+      g_utf8_make_valid</literal>. This occurs when the Enea uCPE Manager is
      installed on CentOS 7 prior to C7.1804 (kernel version &lt; 3.10.0-862).
      As a workaround, update glib2 to version 2.54.2 or later, using
      <command>#yum update glib2</command>.</para>
diff --git a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
index 10c29ca..65b1784 100644
--- a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
@@ -42,21 +42,21 @@
      </listitem>
      <listitem>
-        <para>Support for installing NFV Access on eMMC disks.</para>
+        <para>Support for installing Enea NFV Access on eMMC disks.</para>
      </listitem>
      <listitem>
-        <para>Support for installing NFV Access on disks larger than
+        <para>Support for installing Enea NFV Access on disks larger than
        1TB.</para>
      </listitem>
      <listitem>
-        <para>Improved boot time of NFV Access by removing unnecessary or
+        <para>Improved boot time of Enea NFV Access by removing unnecessary or
        redundant services.</para>
      </listitem>
      <listitem>
-        <para>Fixed the NFV Access bare metal installation on Dell
+        <para>Fixed the Enea NFV Access bare metal installation on Dell
        VEP1445.</para>
        <remark>More information might be needed here.</remark>
@@ -67,7 +67,7 @@
      </listitem>
      <listitem>
-        <para><remark>ELCCR-354</remark>Improved uCPE Manager instance
+        <para><remark>ELCCR-354</remark>Improved Enea uCPE Manager instance
        recovery from a faulty state, through the System Backup
        functionality.</para>
      </listitem>
@@ -110,7 +110,7 @@
        framework that will replace the existing AF&amp;TH in the next major
        release. The new automation framework has improved usability and an
        extended automation feature set. It has to be downloaded separately as
-        it is not part of the standard NFV Access 2.3 distribution. The
+        it is not part of the standard Enea NFV Access 2.3 distribution. The
        Automation Framework - Early Access distribution also includes updated
        user documentation.</para>
      </listitem>
@@ -144,7 +144,7 @@
        xmlns:xi="http://www.w3.org/2001/XInclude"
        xpointer="element(book_enea_nfv_access_ucpem_open_source/1)" />.
        Provides license information pertaining to packages available with the
-        uCPE Manager.</para>
+        Enea uCPE Manager.</para>
      </listitem>
      <listitem>