121 files changed, 2076 insertions, 2211 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 58d90a8..1a1bd48 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -26,8 +26,8 @@ include init.mk
 #BUILDBOOT_XML       := book-enea-nfv-access-release-info/doc/build_boot_generated.xml
 #BUILDBOOT_TEMPLATE  := book-enea-nfv-access-release-info/doc/build_boot_template.xml
 
-PKGDIFF_GEN_XML     := book-enea-nfv-access-release-info/doc/pkgdiff_generated.xml
-JIRA_ISSUES_GEN_XML := book-enea-nfv-access-release-info/doc/jiraissues_generated.xml
+#PKGDIFF_GEN_XML     := book-enea-nfv-access-release-info/doc/pkgdiff_generated.xml
+#JIRA_ISSUES_GEN_XML := book-enea-nfv-access-release-info/doc/jiraissues_generated.xml
 
 MACHINE_LIST_XML    := book-enea-nfv-access-release-info/doc/machine_list_generated.xml
 
@@ -50,7 +50,7 @@ DOCBOOK_TO_BOOKDIR ?= yes
 DOCBOOK_CLEANTMP ?= yes
 
 #Components (books) in this subsystem. Now use all books found here
-COMPONENTS := book-enea-nfv-access-auto-fw-th-open-source book-enea-nfv-access-auto-fw-th-user-guide book-enea-nfv-access-evalkit book-enea-nfv-access-example-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-platform-open-source book-enea-nfv-access-release-info book-enea-nfv-access-system-test-specification book-enea-nfv-access-telemetry-open-source book-enea-nfv-access-ucpem-open-source
+COMPONENTS := book-enea-edge-auto-fw-th-open-source book-enea-edge-auto-fw-th-user-guide book-enea-nfv-access-evalkit book-enea-edge-example-usecases book-enea-edge-getting-started book-enea-edge-runtime-open-source book-enea-edge-release-info book-enea-edge-system-test-specification book-enea-edge-telemetry-open-source book-enea-edge-management-open-source
 
 
 # --------------------------------------------------------------
@@ -184,7 +184,7 @@ endif
 books: init
 # BOOKPACKAGES is defined in all book-*/swcomp.mk
         $(VERB)DISTRO_VERSION=`egrep '"EneaLinux_REL_VER"><phrase>' $(ELTF_PARAMS_UPDATED) | sed 's/.*<phrase>//;s/<\/phrase>.*//'` ; \
-               BOOKVER="Enea NFV Access-$$DISTRO_VERSION"-$(shell date +"%Y.%m.%d"); \
+               BOOKVER="Enea Edge-$$DISTRO_VERSION"-$(shell date +"%Y.%m.%d"); \
          for book in $(BOOKPACKAGES); do \
           for format in $(FORMAT); do \
             $(MAKE) -f $(DOCBOOKMAKE)/make_docbook_standalone.mk BOOK=$$book FORMAT=$$format BOOK_VER="$$BOOKVER" books || exit 10; \
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/README b/doc/book-enea-edge-auto-fw-th-open-source/doc/README
index e546e6f..e546e6f 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/README
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/README
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml
index dbf06e3..24f674d 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/about.xml
@@ -5,8 +5,8 @@
   <title>About this Report</title>
 
   <para>This document contains the open source and license information
-  pertaining to the Automation Framework and Test Harness provided with
-  Enea NFV Access <xi:include
+  pertaining to the Enea Edge Automation Framework and Test Harness provided with
+  Enea Edge <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>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml
index 3305873..df5e029 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_auto_fw_th_open_source">
-  <title><trademark class="registered">Enea</trademark> NFV Access Automation Framework and Test Harness Open Source Report</title>
+<book id="book_enea_edge_auto_fw_th_open_source">
+  <title><trademark class="registered">Enea</trademark> Edge Automation Framework and Test Harness Open Source Report</title>
   
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml b/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml
index 31e8edb..dd9597e 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-auto-fw-th-open-source/doc/licenses.xml
@@ -33,28 +33,28 @@
 
         <tbody valign="top">
           <row>
-            <entry>Automation Framework and Test Harness</entry>
+            <entry>Enea Edge Automation Framework and Test Harness</entry>
 
             <entry><xi:include
             href="../../s_doceneacommon/doc/eltf_params_updated.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
             xpointer="element(EneaLinux_REL_VER/1)" /></entry>
 
-            <entry>Configuration and Automation Framework for the uCPE Manager
+            <entry>Configuration and Automation Framework for the Edge Manager
             GUI.</entry>
 
             <entry>ENEA-SRC-R2</entry>
           </row>
 
           <row>
-            <entry>Automation Framework and Test Harness</entry>
+            <entry>Enea Edge Automation Framework and Test Harness</entry>
 
             <entry><xi:include
             href="../../s_doceneacommon/doc/eltf_params_updated.xml"
             xmlns:xi="http://www.w3.org/2001/XInclude"
             xpointer="element(EneaLinux_REL_VER/1)" /></entry>
 
-            <entry>Configuration and Automation Framework for the uCPE Manager
+            <entry>Configuration and Automation Framework for the Edge Manager
             GUI.</entry>
 
             <entry>ENEA-EXAMPLE-R2</entry>
@@ -74,7 +74,7 @@
     <section id="lic_0">
       <title>ENEA-SRC-R2</title>
 
-      <para><programlisting> Copyright (C) 2019 by Enea.
+      <para><programlisting> Copyright (C) 2019 by Enea Software AB.
  All rights reserved.
 
  This Software is furnished under a software license agreement and
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk b/doc/book-enea-edge-auto-fw-th-open-source/swcomp.mk
index 2f2e677..24463ac 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk
+++ b/doc/book-enea-edge-auto-fw-th-open-source/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-auto-fw-th-open-source
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) AF&TH Open Source Report"
+BOOKPACKAGES := book-enea-edge-auto-fw-th-open-source
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Automation Framework and Test Harness Open Source Report"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index 5e6ba24..8c4ee5e 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
@@ -11,15 +11,15 @@
 
     <para>The <literal>/device</literal> folder contains Python scripts for
     adding uCPE device(s), receiving uCPE events' reports, removing a uCPE
-    device, waiting for a uCPE device to connect to the uCPE Manager, as well
+    device, waiting for a uCPE device to connect to the Enea Edge Management, as well
     as scripts for adding and removing an offline configuration store. This
     folder also contains scripts for uploading and removing an NFVA image into
-    the uCPE Manager, and for installing and activating a NFVA image on a uCPE
+    the Enea Edge Management, and for installing and activating a NFVA image on a uCPE
     Device.</para>
 
     <para>The <literal>/customScripts</literal> folder contains Python scripts
-    for uploading custom scripts onto the uCPE Manager and uCPE device(s), for
-    removing custom scripts from the uCPE Manager and uCPE device(s).</para>
+    for uploading custom scripts onto the Enea Edge Management and uCPE device(s), for
+    removing custom scripts from the Enea Edge Management and uCPE device(s).</para>
 
     <para>The <literal>/network</literal> folder contains Python scripts for
     binding or unbinding a network interface to and from a uCPE device (DPDK
@@ -32,12 +32,14 @@
       <para>Commands within the network folder that include the option
       <emphasis role="bold">-o</emphasis> allow the user to perform the action
       in an offline configuration store alternative available for use at a
-      later setup time. Commands that include the <emphasis
-      role="bold">-n</emphasis> option refer to a uCPE device, with the
-      operation being performed on uCPE device. All options contain either
-      <emphasis role="bold">-n</emphasis>, <emphasis role="bold">-o</emphasis>
-      or both. One of them must always be provided, if both are provided, -o
-      has priority, and -n is thus ignored.</para>
+      later setup time.</para> 
+      <para>Commands that include the <emphasis role="bold">-n</emphasis> 
+      option refer to a uCPE device, with the operation being performed on uCPE device.</para> 
+      <para>All options contain either <emphasis role="bold">-n</emphasis>, 
+      <emphasis role="bold">-o</emphasis> or both. One of them must always be provided, 
+      if both are provided, -o has priority, and -n is thus ignored.</para>
+      <para>In the following script examples, <emphasis> Enea Edge Management 
+      </emphasis> is reffered as <emphasis>Enea uCPE Manager</emphasis>.</para>
     </note>
 
     <para>The <literal>/unittestSuite</literal> folder contains JSON files for
@@ -79,7 +81,7 @@
       the path to the file describing the test cases to be performed against
       the designated script.</para>
 
-      <para>Steps for running the Python unit-test suite on the uCPE Manager
+      <para>Steps for running the Python unit-test suite on the Enea Edge Management
       are provided below.</para>
 
       <section id="script_opts">
@@ -234,8 +236,8 @@ consoleLoggingLevel = logging.INFO
               <row>
                 <entry><literal>username</literal></entry>
 
-                <entry>The user authentication used to log into the uCPE
-                Manager. This can be overwritten by setting the Python
+                <entry>The user authentication used to log into the
+                Enea Edge Management. This can be overwritten by setting the Python
                 unit-test suite command line option
                 <literal>-u</literal>.</entry>
               </row>
@@ -243,7 +245,7 @@ consoleLoggingLevel = logging.INFO
               <row>
                 <entry><literal>password</literal></entry>
 
-                <entry>The password used to log into the uCPE Manager. This
+                <entry>The password used to log into the Enea Edge Management. This
                 can be overwritten by setting the Python unit-test suite
                 command line option <literal>-p</literal>.</entry>
               </row>
@@ -251,7 +253,7 @@ consoleLoggingLevel = logging.INFO
               <row>
                 <entry><literal>host</literal></entry>
 
-                <entry>The IP address of the uCPE Manager host. This can be
+                <entry>The IP address of the Enea Edge Management host. This can be
                 overwritten by setting the Python unit-test suite command line
                 option <literal>-H</literal>.</entry>
               </row>
@@ -540,7 +542,7 @@ OK</programlisting>
       <title>Adding a uCPE Device</title>
 
       <para>Steps for adding, configuring and running a uCPE device onto the
-      uCPE manager are described below .</para>
+      Enea Edge Management are described below .</para>
 
       <section id="opts_add_device">
         <title>Script Options</title>
@@ -624,7 +626,7 @@ Options:
     <section id="remove_ucpe_device">
       <title>Removing a uCPE Device</title>
 
-      <para>Steps for removing a uCPE device from the uCPE manager are
+      <para>Steps for removing a uCPE device from the Enea Edge Management are
       described below.</para>
 
       <section id="rem_script_opts">
@@ -701,7 +703,7 @@ host
       <title>Waiting a uCPE Device</title>
 
       <para>Steps and details for how to Wait a uCPE device to connect to the
-      uCPE Manager after installation, are described below.</para>
+      Enea Edge Management after installation, are described below.</para>
 
       <section id="wait_script_opts">
         <title>Script Options</title>
@@ -779,7 +781,7 @@ Options:
       <title>Printing the uCPE Device Log</title>
 
       <para>Steps and details on how to Print the events log for a specific
-      uCPE device installed in the uCPE Manager, are explained below.</para>
+      uCPE device installed in the Enea Edge Management, are explained below.</para>
 
       <section id="print_script_opts">
         <title>Script Options</title>
@@ -1380,7 +1382,7 @@ Options:
     <section id="onboard_vnf_image">
       <title>Onboarding a VNF Image Raw</title>
 
-      <para>How to Onboard a VNF image in the uCPE Manager based upon its raw
+      <para>How to Onboard a VNF image in the Enea Edge Management based upon its raw
       constituents, is detailed in depth below.</para>
 
       <section id="script_opts_image">
@@ -1497,7 +1499,7 @@ Options:
     <section id="offboard_vnf">
       <title>Offboarding a VNF</title>
 
-      <para>Steps on how to Offboard a VNF from the uCPE Manager are detailed
+      <para>Steps on how to Offboard a VNF from the Enea Edge Management are detailed
       below.</para>
 
       <section id="script_opts_offimage">
@@ -1563,7 +1565,7 @@ Options:
     <section id="instantiate_vnf">
       <title>Instantiating a VNF</title>
 
-      <para>Instantiating a VNF via the uCPE Manager is detailed below.</para>
+      <para>Instantiating a VNF via the Enea Edge Management is detailed below.</para>
 
       <section id="script_opts_inst">
         <title>Script Options</title>
@@ -1642,7 +1644,7 @@ License("vnf_config/fortigateImage/fortigateLicense.lic")
     <section id="control_vnf_inst">
       <title>Controlling a VNF Instance</title>
 
-      <para>How to Control a VNF instance from the Enea uCPE Manager is
+      <para>How to Control a VNF instance from the Enea Edge Management is
       detailed below.</para>
 
       <note>
@@ -1651,7 +1653,7 @@ License("vnf_config/fortigateImage/fortigateLicense.lic")
         become unresponsive. Depending on the actual VNF, the time required
         between life-cycle operations may vary from several seconds to half a
         minute or even more. If a VNF becomes unresponsive, the only possible
-        action is to "Force Delete" the instance from the uCPE Manager.</para>
+        action is to "Force Delete" the instance from the Enea Edge Management.</para>
       </note>
 
       <section id="script_opts_control">
@@ -1736,7 +1738,7 @@ fortigateFWInstance -c stop
       <title>Destroying a VNF Instance</title>
 
       <para>Steps and options on how to Destroy a VNF instance from the Enea
-      uCPE Manager are described below.</para>
+      Edge Management are described below.</para>
 
       <section id="script_opts_destroy">
         <title>Script Options</title>
@@ -1801,10 +1803,10 @@ fortigateFWInstance
     </section>
 
     <section id="upload_vnf_image">
-      <title>Uploading a NFV Access image onto the Enea uCPE Manager</title>
+      <title>Uploading an Enea Edge image onto the Enea Edge Management</title>
 
-      <para>Steps and options on how to Upload a NFV Access image onto the
-      Enea uCPE Manager are described below.</para>
+      <para>Steps and options on how to Upload an Enea Edge image onto the
+      Enea Edge Management are described below.</para>
 
       <section id="script_opts_upload">
         <title>Script Options</title>
@@ -1838,7 +1840,7 @@ Options:
       <section id="json_upload">
         <title>Configuring the JSON File</title>
 
-        <para>The JSON configuration file needed to upload a NFV Access image
+        <para>The JSON configuration file needed to upload an Enea Edge image
         should contain a list of dictionaries. Each dictionary indicates the
         test case name and the test case arguments passed to the
         <filename>uploadImage</filename> Python module.</para>
@@ -1874,11 +1876,11 @@ Options:
     </section>
 
     <section id="delete_vnf_image">
-      <title>Deleting a NFV Access image file from the Enea uCPE
-      Manager</title>
+      <title>Deleting an Enea Edge image file from the
+      Enea Edge Management</title>
 
-      <para>Steps and options on how to Delete a NFV Access image from the
-      Enea uCPE Manager are described below.</para>
+      <para>Steps and options on how to Delete an Enea Edge image from the
+      Enea Edge Management are described below.</para>
 
       <section id="script_opts_deleteupload">
         <title>Script Options</title>
@@ -1909,7 +1911,7 @@ Options:
       <section id="json_delete_upload">
         <title>Configuring the JSON File</title>
 
-        <para>The JSON configuration file needed to delete a NFV Access image
+        <para>The JSON configuration file needed to delete an Enea Edge image
         should contain a list of dictionaries. Each dictionary indicates the
         test case name and the test case arguments passed to the
         <filename>deleteUpgradeFile</filename> Python module.</para>
@@ -1948,11 +1950,11 @@ image was successfully removed
     </section>
 
     <section id="install_activate_vnf_image">
-      <title>Installing and activating a NFV Access image on an uCPE device
-      from the Enea uCPE Manager</title>
+      <title>Installing and activating an Enea Edge image on an uCPE device
+      from the Enea Edge Management</title>
 
-      <para>Steps and options on how to Install and Activate a NFV Access
-      image on an uCPE device from the Enea uCPE Manager are described
+      <para>Steps and options on how to Install and Activate an Enea Edge
+      image on an uCPE device from the Enea Edge Management are described
       below.</para>
 
       <section id="script_opts_install_activate">
@@ -1989,8 +1991,8 @@ Options:
       <section id="json_install_activate">
         <title>Configuring the JSON File</title>
 
-        <para>The JSON configuration file needed to install and activate a NFV
-        Access image on a uCPE device from the Enea uCPE Manager should
+        <para>The JSON configuration file needed to install and activate an Enea Edge
+        image on a uCPE device from the Enea Edge Management should
         contain a list of dictionaries. Each dictionary indicates the test
         case name and the test case arguments passed to the
         <filename>installAndActivate</filename> Python module.</para>
@@ -2055,10 +2057,10 @@ enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 [20]
 
     <section id="clearing_info_upgrade">
       <title>Clearing information about completed upgrades of uCPE devices
-      from the Enea uCPE Manager</title>
+      from the Enea Edge Management</title>
 
       <para>Steps and options on how to clear information about completed
-      upgrades of uCPE devices from the Enea uCPE Manager are described
+      upgrades of uCPE devices from the Enea Edge Management are described
       below.</para>
 
       <section id="script_opts_clearinfo">
@@ -2087,7 +2089,7 @@ Options:
         <title>Configuring the JSON File</title>
 
         <para>No JSON configuration file is needed to clear information about
-        completed upgrades of uCPE devices from the Enea uCPE Manager. The
+        completed upgrades of uCPE devices from the Enea Edge Management. The
         <filename>clearCompletedUpgradesInfo</filename> Python module can be
         run without a JSON file as a parameter.</para>
       </section>
@@ -2110,10 +2112,10 @@ Options:
     </section>
 
     <section id="upload_custom_script">
-      <title>Uploading a Custom Script to the uCPE Manager</title>
+      <title>Uploading a Custom Script to the Enea Edge Management</title>
 
-      <para>Steps and options on how to upload a custom script to the uCPE
-      Manager are described below.</para>
+      <para>Steps and options on how to upload a custom script to the
+      Enea Edge Management are described below.</para>
 
       <section id="script_opts_upload_custom_script">
         <title>Script Options</title>
@@ -2147,7 +2149,7 @@ Options:
         <title>Configuring the JSON File</title>
 
         <para>The JSON configuration file needed to upload a Custom Script to
-        the uCPE Manager must contain a list of dictionaries. Each dictionary
+        the Enea Edge Management must contain a list of dictionaries. Each dictionary
         indicates the test case name and the test case arguments passed to the
         <filename>customScripts/upload</filename> Python module.</para>
 
@@ -2184,11 +2186,11 @@ echo test_success_after_always
     </section>
 
     <section id="upload_custom_script_device">
-      <title>Uploading a Custom Script from the uCPE Manager to a
+      <title>Uploading a Custom Script from the Enea Edge Management to a
       Device</title>
 
-      <para>Steps and options on how to upload a custom script from the uCPE
-      Manager to a Device are described below.</para>
+      <para>Steps and options on how to upload a custom script from the
+      Enea Edge Management to a Device are described below.</para>
 
       <section id="script_opts_upload_custom_script_device">
         <title>Script Options</title>
@@ -2225,7 +2227,7 @@ Options:
         <title>Configuring the JSON File</title>
 
         <para>The JSON configuration file needed to upload a Custom Script
-        from the uCPE Manager to a Device must contain a list of dictionaries.
+        from the Enea Edge Management to a Device must contain a list of dictionaries.
         Each dictionary indicates the test case name and the test case
         arguments passed to the
         <filename>customScripts/uploadOnDevice</filename> Python
@@ -2263,10 +2265,10 @@ test_success_after_always -e always-after-startup -n inteld1521-6
     </section>
 
     <section id="delete_custom_script">
-      <title>Removing a Custom Script from the uCPE Manager</title>
+      <title>Removing a Custom Script from the Enea Edge Management</title>
 
-      <para>Steps and options on how to remove a custom script from the uCPE
-      Manager are described below.</para>
+      <para>Steps and options on how to remove a custom script from the
+      Enea Edge Management are described below.</para>
 
       <section id="script_opts_delete_custom_script">
         <title>Script Options</title>
@@ -2300,8 +2302,8 @@ Options:
         <title>Configuring the JSON File</title>
 
         <para>The JSON configuration file needed to remove a Custom Script
-        from the uCPE Manager<remark>did you mean device or uCPE
-        Manager?</remark> must contain a list of dictionaries. Each dictionary
+        from the Enea Edge Management<remark>did you mean device or
+        Enea Edge Management?</remark> must contain a list of dictionaries. Each dictionary
         indicates the test case name and the test case arguments passed to the
         <filename>customScripts/delete</filename> Python module.</para>
 
@@ -2469,7 +2471,7 @@ phase always-after-startup from inteld1521-6
       </note>
 
       <section id="upload_customscrp_ucpemg">
-        <title>Uploading a Custom Script to the uCPE Manager</title>
+        <title>Uploading a Custom Script to the Enea Edge Management</title>
 
         <programlisting>$ python automation_framework/customScripts/upload.py \
 -f lab_config/customScripts/test_success_after_always -e always-after-startup
@@ -2485,7 +2487,7 @@ echo test_success_after_always
       </section>
 
       <section id="upload_customscrp_device">
-        <title>Uploading a Custom Script from the uCPE Manager to a
+        <title>Uploading a Custom Script from the Enea Edge Management to a
         Device</title>
 
         <programlisting>$ python automation_framework/customScripts/uploadOnDevice.py -c \
@@ -2517,7 +2519,7 @@ phase always-after-startup from inteld1521-6
       </section>
 
       <section id="remove_customscrp_ucpemg">
-        <title>Removing a Custom Script from the uCPE Manager</title>
+        <title>Removing a Custom Script from the Enea Edge Management</title>
 
         <programlisting>$ python automation_framework/customScripts/delete.py -c \
 test_success_after_always -e always-after-startup
@@ -2536,13 +2538,13 @@ phase always-after-startup from uCPE Manager
     <section id="add_offline_config_store">
       <title>Adding an Offline Configuration Store</title>
 
-      <para>Steps and options on how to add a Config Store in the Enea uCPE
-      Manager are described below.</para>
+      <para>Steps and options on how to add a Config Store in the
+      Enea Edge Management are described below.</para>
 
       <section id="script_opts_add_config_store">
         <title>Script Options</title>
 
-        <para>To add a config store in the Enea uCPE Manager use the
+        <para>To add a config store in the Enea Edge Management use the
         <filename>addConfigStore.py</filename> script detailed below. Bear in
         mind a <filename>CONFIGSTORE</filename> json file is needed to
         successfully run the script in order to add an offline configuration
@@ -2566,7 +2568,7 @@ phase always-after-startup from uCPE Manager
       <section id="runpy_add_config_store">
         <title>Running the Python Module</title>
 
-        <para>Adding an offline config store in the Enea uCPE Manager using
+        <para>Adding an offline config store in the Enea Edge Management using
         the command line:</para>
 
         <programlisting>python automation_framework/device/addConfigStore.py -f \
@@ -2670,15 +2672,15 @@ Options:
     </section>
 
     <section id="remove_offline_config_store">
-      <title>Removing an Offline Configuration Store in the Enea uCPE
-      Manager</title>
+      <title>Removing an Offline Configuration Store in the
+      Enea Edge Management</title>
 
       <para>Steps and options on how to remove an upload of a Config Store
-      from the uCPE Manager are described below.</para>
+      from the Enea Edge Management are described below.</para>
 
       <note>
         <para>Modifications of an Offline Configurations Store are not
-        possible post deployment in the uCPE Manager, as there is no option
+        possible post deployment in the Enea Edge Management, as there is no option
         for changing script states (e.g. changing the DPDK state in the
         <filename>configDPDK.py</filename> python script or unbinding
         interfaces). The offline store must be deleted and the new
@@ -2689,7 +2691,7 @@ Options:
       <section id="script_opts_remove_config_store">
         <title>Script options</title>
 
-        <para>To remove a config store from the uCPE Manager use the
+        <para>To remove a config store from the Enea Edge Management use the
         <filename>removeConfigStore.py</filename> script detailed
         below.</para>
 
@@ -2770,8 +2772,8 @@ Options:
     Manual.</para>
 
     <para>The /<literal>uCPEM_config</literal> directory stores JSON
-    configuration files needed for the setup of the uCPE Manager used by TH.
-    One configuration file is needed per uCPE Manager installation, to be used
+    configuration files needed for the setup of the Enea Edge Management used by TH.
+    One configuration file is needed per Enea Edge Management installation, to be used
     in the TH.</para>
 
     <para>The <literal>/vnf_image</literal> directory stores the VNF Images
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/book.xml
index 0b96de2..a1ffed1 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_auto_fw_th_user_guide">
-  <title><trademark class="registered">Enea</trademark> NFV Access Automation Framework and Test Harness User Guide</title>
+<book id="book_enea_edge_auto_fw_th_user_guide">
+  <title><trademark class="registered">Enea</trademark> Edge Automation Framework and Test Harness User Guide</title>
 
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/components.xml
index 9b775a7..33c1135 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/components.xml
@@ -2,8 +2,8 @@
 <chapter id="components">
   <title>Components</title>
 
-  <para>An overview of the Enea NFV Access Runtime Platform and the uCPE
-  Manager in cooperation with the Automation Framework and Test Harness, will
+  <para>An overview of the Enea Edge Runtime and the Edge Management
+  in cooperation with the Enea Edge Automation Framework and Test Harness, will
   be presented in detail.</para>
 
   <figure>
@@ -18,23 +18,23 @@
   </figure>
 
   <section id="enfva_runtime_plt">
-    <title>Enea NFV Access</title>
+    <title>Enea Edge</title>
 
-    <para>Enea NFV Access is comprised of the Enea uCPE Manager and the Enea
-    NFV Access Runtime Platform.</para>
+    <para>Enea Edge is comprised of the Enea Edge Management and the Enea
+    Edge Runtime.</para>
 
     <section id="eucpe_manager">
-      <title>Enea uCPE Manager</title>
+      <title>Enea Edge Management</title>
 
-      <para>The Enea uCPE Manager application needs to be installed on a
+      <para>The Enea Edge Management application needs to be installed on a
       supported platform. Upon installation, the system will be set up to
-      manage Enea NFV Access "devices", these are the virtualized CPE devices
+      manage Enea Edge Runtime "devices", these are the virtualized CPE devices
       used in testing.</para>
 
-      <para>For more on Enea uCPE Manager installation instructions, please
+      <para>For more on Enea Edge Management installation instructions, please
       refer to the section on how to <olink
       targetdoc="book_enea_nfv_access_getting_started"
-      targetptr="install_ucpe_mg">Installing the Enea uCPE Manager in the
+      targetptr="install_ucpe_mg">Installing the Enea Edge Management 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>
@@ -42,38 +42,37 @@
     </section>
 
     <section id="ena_plat">
-      <title>Enea NFV Access Runtime Platform</title>
+      <title>Enea Edge Runtime</title>
 
-      <para>One or more uCPE devices running the Enea NFV Access Runtime
-      Platform are required as hosts to run the VNF(s). The uCPE device is
-      known to the uCPE Manager as the "VcpeAgent" device module.</para>
+      <para>One or more uCPE devices running the Enea Edge Runtime
+      are required as hosts to run the VNF(s). The uCPE device is
+      known to the Enea Edge Management as the "VcpeAgent" device module.</para>
 
       <note>
-        <para>Before running any use case with the Automation Framework or the
-        Test Harness, make sure the uCPE device(s) have been added to the uCPE
-        Manager.</para>
+        <para>Before running any use case with the Enea Edge Automation Framework and
+        Test Harness, make sure the uCPE device(s) have been added to the Edge Management.</para>
       </note>
 
       <para>Adding a VcpeAgent device can be done via two methods:</para>
 
       <itemizedlist>
         <listitem>
-          <para>Through the uCPE Manager GUI. Add the device using the
+          <para>Through the Enea Edge Management GUI. Add the device using the
           appropriate parameters by launching the UI under
           <literal>Devices</literal> -&gt; <literal>Manage</literal> in the
           main screen.</para>
         </listitem>
 
         <listitem>
-          <para>REST API. Invoke the uCPE Manager REST API to add a
+          <para>REST API. Invoke the Enea Edge Management REST API to add a
           device.</para>
         </listitem>
       </itemizedlist>
 
-      <para>For more on Enea NFV Access installation instructions, please
+      <para>For more on Enea Edge installation instructions, please
       refer to chapter <olink targetdoc="book_enea_nfv_access_getting_started"
       targetptr="prep_usb_ena">Preparing the USB stick for installation of the
-      Enea NFV Access Runtime Platform in the <xi:include
+      Enea Edge Runtime 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>
@@ -84,15 +83,15 @@
   <section id="automation">
     <title>Automation Framework</title>
 
-    <para>Testing can be performed by running the available Python scripts
-    against the uCPE Manager REST API (Python samples supplied). This can be
+    <para>Testing can be performed by running Automation Framework (AF) Python scripts
+    against the Enea Edge Management REST API (Python samples supplied). This can be
     done by using the Python scripts individually or by using the Python
     unit-test suite that is able to automatically run test-cases defined for
     each available Python script.</para>
 
     <para>In either case, it is desirable to use a different host (instead of
-    running the tests on the same system as the uCPE Manager) in order to
-    ensure that the uCPE Manager is setup and installed correctly in terms of
+    running the tests on the same system as the Enea Edge Management) in order to
+    ensure that the Enea Edge Management is setup and installed correctly in terms of
     allowing external users to access it and use it effectively.</para>
   </section>
 
@@ -101,8 +100,8 @@
 
     <para>The Test Harness (TH) provides a way for driving configuration with
     Ansible Playbooks, by running the python modules from the Automation
-    Framework (AF) and by direct connection over SSH to the boards that run
-    Enea NFV Access.</para>
+    Framework and by direct connection over SSH to the boards that run
+    Enea Edge.</para>
 
     <para>The Test Harness includes an automated test suite that
     contains:</para>
@@ -110,14 +109,14 @@
     <itemizedlist>
       <listitem>
         <para>VNF, Device and Network Smoke Test Cases. A sample test suite
-        that acts as basic smoke tests for Enea NFV Access and also as a
+        that acts as basic smoke tests for Enea Edge and also as a
         sanity-check test suite for the AF and TH.</para>
       </listitem>
 
       <listitem>
         <para>VNF Deployment and Lifecycle. A sample test suite that verifies
         the instantiation, lifecycle control and destruction of a VNF for Enea
-        NFV Access.</para>
+        Edge.</para>
       </listitem>
 
       <listitem>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
index 6f029f7..55c5510 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/getting_started.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="getting_started">
-  <title>Getting Started with the Automation Framework and Test
+  <title>Getting Started with the Enea Edge Automation Framework and Test
   Harness</title>
 
   <section id="prerequisites">
     <title>Prerequisites</title>
 
-    <para>For installation of the Automation Framework and Test Harness a
+    <para>For installation of the Enea Edge Automation Framework and Test Harness a
     CentOS 7 host machine is needed with support for:</para>
 
     <itemizedlist>
@@ -28,8 +28,8 @@
     </itemizedlist>
 
     <note>
-      <para>The Automation Framework and Test Harness installation may be done
-      on the same machine used for uCPE Manager installation, although this is
+      <para>The Enea Edge Automation Framework and Test Harness installation may be done
+      on the same machine used for Enea Edge Management installation, although this is
       not encouraged. For more details see section <olink
       targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
       targetptr="automation">Automation Framework in the <xi:include
@@ -69,7 +69,7 @@
         </listitem>
       </itemizedlist></para>
 
-    <para><emphasis role="bold">uCPE Manager Host
+    <para><emphasis role="bold">Enea Edge Management Host
     Requirements</emphasis></para>
 
     <itemizedlist spacing="compact">
@@ -82,12 +82,12 @@
       </listitem>
 
       <listitem>
-        <para>uCPE Manager installed.</para>
+        <para>Enea Edge Management installed.</para>
 
         <note>
-          <para>For details on how to install the uCPE Manager, see <olink
+          <para>For details on how to install the Enea Edge Management, see <olink
           targetdoc="book_enea_nfv_access_getting_started"
-          targetptr="install_ucpe_mg">Installing the Enea uCPE Manager in the
+          targetptr="install_ucpe_mg">Installing the Enea Edge Management 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>
@@ -111,13 +111,13 @@
         </listitem>
 
         <listitem>
-          <para>Enea NFV Access Runtime Platform installed.</para>
+          <para>Enea Edge Runtime installed.</para>
 
           <note>
-            <para>For information on how to install Enea NFV Access refer to
+            <para>For information on how to install Enea Edge refer to
             <olink targetdoc="book_enea_nfv_access_getting_started"
             targetptr="prep_usb_ena">Preparing the USB stick for installation
-            of the Enea NFV Access Runtime Platform in the <xi:include
+            of the Enea Edge Runtime 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>
@@ -155,7 +155,7 @@
         </listitem>
 
         <listitem>
-          <para>Enea NFV Access Runtime Platform installed.</para>
+          <para>Enea Edge Runtime installed.</para>
         </listitem>
       </itemizedlist></para>
   </section>
@@ -166,7 +166,7 @@
     <orderedlist>
       <listitem>
         <para>Unzip the
-        <filename>Enea_NFV_Access_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip</filename>
+        <filename>Enea_Edge_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip</filename>
         archive file, provided by Enea, on a supported host machine.</para>
 
         <para>The directory in which the archive has been unpacked will be
@@ -180,11 +180,11 @@
       </listitem>
 
       <listitem>
-        <para>Set up the uCPE Manager which will be used by the TH:</para>
+        <para>Set up the Enea Edge Management which will be used by the TH:</para>
 
         <orderedlist spacing="compact">
           <listitem>
-            <para>Create the uCPE Manager JSON config file in the
+            <para>Create the Enea Edge Management JSON config file in the
             <literal>&lt;AF-TH-install-dir&gt;/uCPEM_config/</literal>
             directory:<programlisting>{
 "ucpe_usr":"uCPE Manager Username",
@@ -221,17 +221,17 @@
     <literal>&lt;AF-THinstall-dir&gt;</literal> directory.</para>
 
     <para>Subsequent use of the installation requires activating the Python
-    virtual enviroment before using the Automation Framework and Test Harness:
+    virtual enviroment before using the Enea Edge Automation Framework and Test Harness:
     <literal>source
     &lt;AF-TH-install-dir&gt;/testHarness-venv/bin/activate</literal>.</para>
 
-    <para>Furthermore, if a user wants to use a new uCPE Manager instance for
+    <para>Furthermore, if a user wants to use a new Enea Edge Management instance for
     a new session, the user also has to re-run the
     <filename>setupuCPEManager.yml</filename> playbook with the corresponding
-    JSON config for the new uCPE Manager instance.</para>
+    JSON config for the new Enea Edge Management instance.</para>
 
     <note>
-      <para>Automation Framework and Test Harness History Information can be
+      <para>Enea Edge Automation Framework and Test Harness History Information can be
       found in the AF&amp;TH CHANGELOG file available in:
       <filename>&lt;AF-TH-install-dir&gt;/CHANGELOG</filename></para>
     </note>
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
new file mode 100755
index 0000000..0329450
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
new file mode 100755
index 0000000..a384877
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
diff --git a/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/environment_basicsetup.png b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
new file mode 100755
index 0000000..c30dcfd
--- /dev/null
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/overview.xml
index eadc1d5..4fec3d9 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/overview.xml
@@ -2,22 +2,20 @@
 <chapter id="overview">
   <title>Overview</title>
 
-  <para>This document describes the Automation Framework and Test Harness for
-  Enea NFV Access, along with instructions regarding the necessary steps to
+  <para>This document describes the Enea Edge Automation Framework and Test Harness, along with instructions regarding the necessary steps to
   run these software tools.</para>
 
   <section id="descrip">
     <title>Description</title>
 
     <para>The Automation Framework provides a way for driving configuration
-    with Python scripting. It complements the Enea uCPE Manager GUI and uses
-    the northbound REST APIs, given to provide full usability of the Enea uCPE
-    Manager features.</para>
+    with Python scripting. It complements the Enea Edge Management GUI and uses
+    the northbound REST APIs, given to provide full usability of the Enea Management
+    features.</para>
 
     <para>The Test Harness is based on running Ansible Playbooks to complete
     different test cases, which make use of the Automation Framework Python
-    modules and/or direct commands on the uCPE devices running the Enea NFV
-    Access Runtime Platform.</para>
+    modules and/or direct commands on the uCPE devices running the Enea Edge Runtime.</para>
   </section>
 
   <section id="def_acro">
@@ -39,10 +37,10 @@
 
         <tbody>
           <row>
-            <entry>Enea NFV Access</entry>
+            <entry>Enea Edge</entry>
 
-            <entry>The Enea NFV Access (with ODM) Runtime Platform and the
-            Enea uCPE Manager.</entry>
+            <entry>The Enea Edge Runtime and the
+            Enea Edge Management.</entry>
           </row>
         </tbody>
       </tgroup>
@@ -66,7 +64,7 @@
           <row>
             <entry>AF</entry>
 
-            <entry>Automation Framework for Enea NFV Access.</entry>
+            <entry>Automation Framework for Enea Edge.</entry>
           </row>
 
           <row>
@@ -129,12 +127,7 @@
             <entry>Network Functions Virtualization.</entry>
           </row>
 
-          <row>
-            <entry>ODM</entry>
-
-            <entry>Enea Element On Device Management.</entry>
-          </row>
-
+         
           <row>
             <entry>OVS</entry>
 
@@ -162,11 +155,11 @@
           <row>
             <entry>TH</entry>
 
-            <entry>Test Harness for Enea NFV Access.</entry>
+            <entry>Test Harness for Enea Edge.</entry>
           </row>
 
           <row>
-            <entry>uCPE Manager</entry>
+            <entry>Enea Edge Management</entry>
 
             <entry>Enea Universal Customer Premises Equipment Manager.</entry>
           </row>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/troubleshooting_guide.xml b/doc/book-enea-edge-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
index f51fe11..a5cd664 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/doc/troubleshooting_guide.xml
@@ -21,11 +21,11 @@
     </listitem>
 
     <listitem>
-      <para>When setting up the uCPE Manager to be used by the TH through the
+      <para>When setting up the Enea Edge Management to be used by the TH through the
       <literal>setupuCPEManager.yml</literal> Playbook, if the uCPE
       username/password/host are incorrect or are missing, all the Sample test
       cases will fail. If the FTP username/password/port are wrong or are
-      missing, the tests that require file transfer to the uCPE Manager will
+      missing, the tests that require file transfer to the Enea Edge Management will
       fail.</para>
     </listitem>
 
diff --git a/doc/book-enea-nfv-access-platform-open-source/swcomp.mk b/doc/book-enea-edge-auto-fw-th-user-guide/swcomp.mk
index fc62acc..d17c2b3 100644..100755
--- a/doc/book-enea-nfv-access-platform-open-source/swcomp.mk
+++ b/doc/book-enea-edge-auto-fw-th-user-guide/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-platform-open-source
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access Runtime Platform Open Source Report"
+BOOKPACKAGES := book-enea-edge-auto-fw-th-user-guide
+BOOKDESC_$(BOOKPACKAGES) := "Enea Enea Edge $(PROD_VER) Automation Framework and Test Harness User Guide"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml b/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml
index 7ba8a7b..89692b0 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/128t_vnf_router.xml
+++ b/doc/book-enea-edge-example-usecases/doc/128t_vnf_router.xml
@@ -68,7 +68,7 @@
       <para><emphasis role="bold">Configuring Network Interfaces on uCPE
       devices:</emphasis><orderedlist>
           <listitem>
-            <para>Add the trgt uCPE device into the uCPE Manager:
+            <para>Add the trgt uCPE device into Enea Edge Management:
             <literal>Devices -&gt; Manage -&gt; Add</literal>.</para>
 
             <para>Fill in the required fields with the following data:</para>
@@ -266,8 +266,8 @@
                     <entry>Create</entry>
 
                     <entry><para>The system will automatically select the
-                    physical interface that has access to the uCPE
-                    Manager.</para></entry>
+                    physical interface that has access to Enea Edge
+                    Management.</para></entry>
                   </row>
                 </tbody>
               </tgroup>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_1.xml b/doc/book-enea-edge-example-usecases/doc/appendix_1.xml
index df262af..df262af 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_1.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_1.xml
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml b/doc/book-enea-edge-example-usecases/doc/appendix_2.xml
index 2458d99..2458d99 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_2.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_2.xml
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_3.xml b/doc/book-enea-edge-example-usecases/doc/appendix_3.xml
index e8bd5ce..e8bd5ce 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_3.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_3.xml
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
index 45689e5..34961ca 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <appendix id="appendix_four_cust">
-  <title>Running Enea Automation Framework tests</title>
+  <title>Running Enea Edge Automation Framework and Test Harness</title>
 
-  <para>For more detailed information regarding the Automation Framework and
+  <para>For more detailed information regarding the Enea Edge Automation Framework and
   Test Harness 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_auto_fw_th_user_guide/1)" />.</para>
 
-  <para>The most relevant information from the Automation Framework and Test
+  <para>The most relevant information from the Enea Edge Automation Framework and Test
   Harness structure is presented below:</para>
 
   <programlisting>|---automation_framework
@@ -64,7 +64,7 @@
     </listitem>
 
     <listitem>
-      <para><literal>version</literal> - The NFVA version.</para>
+      <para><literal>version</literal> - The Enea Edge Runtime version.</para>
     </listitem>
 
     <listitem>
@@ -78,10 +78,10 @@
 
   <note>
     <para>Before starting the two usecases detailed in the following appendix,
-    the uCPE Device needs to be added into the uCPE Manager.</para>
+    the uCPE Device needs to be added into Enea Edge Management.</para>
   </note>
 
-  <para>To properly set up the Automation Framework and Test Harness please
+  <para>To properly set up the Enea Edge Automation Framework and Test Harness please
   see <olink targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
   targetptr="initial_setup">Installation and Initial Setup in the <xi:include
   href="../../s_docbuild/olinkdb/pardoc-names.xml"
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
index 71dee09..67f38e5 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_5.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <appendix id="appendix_five_cust">
-  <title>Example Tests Results using the Automation Framework</title>
+  <title>Example Tests Results using the Automation Framework and Test Harness</title>
 
   <para>In order to run the following example usecases, certain configuration
   file entries need to be modified according to the network setup that it will
@@ -39,7 +39,7 @@
     "maintMode": "false",
     "version": "2.2.3",
     "deviceId": "inteld1521-17"
-}</programlisting>The IP address of the uCPE Manager that will be used in
+}</programlisting>The IP address of Enea Edge Management that will be used in
   these examples is <literal>172.24.3.92</literal>.</para>
 
   <para>The FortiGate and 128T VNF images need to be copied into the
@@ -138,7 +138,7 @@ OK</programlisting>
 
   <section id="ap_d_uc2">
     <title>Use-case 2: Service Chaining 128T - Fortigate Example
-    Usecase</title>
+    Use-case</title>
 
     <programlisting>&gt; python unittestSuite.py -u admin -p admin -H 172.24.3.92 -n inteld1521-17 \
 -s 128t_FG_SFCDeploy.json -d "128T - Fortigate SFC Deployment"
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/book.xml b/doc/book-enea-edge-example-usecases/doc/book.xml
index eb8b0c8..2ffbefe 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/book.xml
+++ b/doc/book-enea-edge-example-usecases/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_example_usecases">
-  <title><trademark class="registered">Enea</trademark> NFV Access Example Use-cases</title>
+<book id="book_enea_edge_example_usecases">
+  <title><trademark class="registered">Enea</trademark> Edge Example Use-cases</title>
 
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/clav_vnf_examples.xml
index 57c79b5..8895c23 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/clav_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/clav_vnf_examples.xml
@@ -42,7 +42,7 @@
         </listitem>
         
         <listitem><para>VNF Configuration files. These files are provided with your Enea
-        NFV Access release:</para>
+        Edge release:</para>
         
         <itemizedlist spacing="compact">
           <listitem><para><filename>clavister-cloudinit.conf</filename>.</para></listitem>
@@ -333,7 +333,7 @@ root@qemux86-64:~# iperf3 -c 192.168.10.10</programlisting>
         </listitem>
         
         <listitem><para>VNF Configuration files. These files are provided with your Enea
-        NFV Access release:</para>
+        Edge release:</para>
           <itemizedlist spacing="compact">
             <listitem><para><filename>clavister-cloudinit.conf</filename>.</para></listitem>
             <listitem><para><filename>enea-vnf-iperf-client.conf</filename>.</para></listitem>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/enea_test_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
index 1f10dbf..bee5a63 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/enea_test_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/enea_test_vnf_examples.xml
@@ -17,7 +17,7 @@
 
     <itemizedlist>
       <listitem>
-        <para>2 Network Interfaces. One for the uCPE manager and one for data
+        <para>2 Network Interfaces. One for Enea Edge Management and one for data
         traffic.</para>
       </listitem>
 
@@ -35,7 +35,7 @@
       </listitem>
 
       <para>VNF Configuration files. These files are provided with your Enea
-      NFV Access release:</para>
+      Edge release:</para>
 
       <listitem>
         <para><filename>enea-vnf-testpmd-fwd.conf</filename>.</para>
@@ -134,7 +134,7 @@
 
       <orderedlist>
         <listitem>
-          <para>Instantiate the Enea NFV Access TestPMD forwarding VNF on uCPE
+          <para>Instantiate the Enea Edge TestPMD forwarding VNF on uCPE
           Device 2 by filling the required fields with the following
           values:</para>
 
@@ -168,7 +168,7 @@
         </listitem>
 
         <listitem>
-          <para>Instantiate the Enea NFV Access TestPMD termination VNF on
+          <para>Instantiate the Enea Edge TestPMD termination VNF on
           uCPE Device 2 by filling the required fields with the following
           values:</para>
 
@@ -218,8 +218,8 @@
           <literal>testpmd_term</literal>.</para>
 
           <note>
-            <para>The flow rules can be described using either the uCPE
-            manager interface or the configuration files.</para>
+            <para>The flow rules can be described using either the Enea Edge 
+            Management interface or the configuration files.</para>
           </note>
         </listitem>
       </itemizedlist>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml b/doc/book-enea-edge-example-usecases/doc/forti_vnf_examples.xml
index 36c7114..bb38140 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/forti_vnf_examples.xml
+++ b/doc/book-enea-edge-example-usecases/doc/forti_vnf_examples.xml
@@ -50,7 +50,7 @@
         </listitem>
 
         <listitem>
-          <para>VNF Configuration file(s), provided with your Enea NFV Access
+          <para>VNF Configuration file(s), provided with your Enea Edge
           release: <filename>fortigate-basic-fw.conf</filename>.</para>
         </listitem>
       </itemizedlist>
@@ -93,7 +93,7 @@
         </listitem>
 
         <listitem>
-          <para>Connect ETH0 to the Lab Network (for Enea uCPE Manager
+          <para>Connect ETH0 to the Lab Network (for Enea Edge Management
           communications).</para>
         </listitem>
 
@@ -302,7 +302,7 @@
         </listitem>
 
         <listitem>
-          <para>VNF Configuration file(s), provided with your Enea NFV Access
+          <para>VNF Configuration file(s), provided with your Enea Edge
           release: <filename>fortigate-sdwan&lt;x&gt;.conf</filename>.</para>
         </listitem>
       </itemizedlist>
@@ -359,7 +359,7 @@
 
         <listitem>
           <para>Connect the <literal>ETH0</literal> interfaces to the Lab
-          Network (for Enea uCPE Manager communications).</para>
+          Network (for Enea Edge Management communications).</para>
         </listitem>
 
         <listitem>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/fortinet_interface.png b/doc/book-enea-edge-example-usecases/doc/images/fortinet_interface.png
index 9452264..9452264 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/fortinet_interface.png
+++ b/doc/book-enea-edge-example-usecases/doc/images/fortinet_interface.png
diff --git a/doc/book-enea-edge-example-usecases/doc/images/trgt.png b/doc/book-enea-edge-example-usecases/doc/images/trgt.png
new file mode 100644
index 0000000..2977524
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/trgt.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg b/doc/book-enea-edge-example-usecases/doc/images/trgt.svg
index d933a63..86f4d12 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/trgt.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,9 +13,9 @@
    viewBox="0 0 291.36588 156.51978"
    version="1.1"
    id="svg1125"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
    sodipodi:docname="trgt.svg"
-   inkscape:export-filename="L:\docu_work\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\trgt.png"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\trgt.png"
    inkscape:export-xdpi="65"
    inkscape:export-ydpi="65">
   <defs
@@ -522,13 +520,13 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.62"
-     inkscape:cx="560.05537"
-     inkscape:cy="285.57838"
+     inkscape:cx="510.81788"
+     inkscape:cy="354.91926"
      inkscape:document-units="mm"
      inkscape:current-layer="layer2"
      showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -539,7 +537,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata1122">
     <rdf:RDF>
@@ -590,9 +589,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -611,9 +610,9 @@
        id="text892"
        y="193.61693"
        x="311.6983"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        xml:space="preserve"><tspan
-         style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+         style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
          y="193.61693"
          x="311.6983"
          id="tspan890"
@@ -698,7 +697,7 @@
            inkscape:connector-curvature="0" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -706,32 +705,30 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="307.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4348">- Connection via cloud/internet:</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="330.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4350">- Back to Back: BTB</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="354.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4651">- Flow rules: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="377.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="400.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342" /></text>
       </g>
     </g>
@@ -752,20 +749,16 @@
            height="25.079741"
            x="872"
            y="137.70079" /></flowRegion><flowPara
-         id="flowPara955" /></flowRoot>    <text
+         id="flowPara955" /></flowRoot>
+    <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="253.30237"
        y="127.42318"
-       id="text947"><tspan
-         sodipodi:role="line"
-         id="tspan945"
-         x="253.30237"
-         y="133.14297"
-         style="font-size:5.64444447px;writing-mode:lr-tb;stroke-width:0.26458332" /></text>
+       id="text947" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332-7)"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332-7)"
        x="77.070297"
        y="140.22328"
        id="text4180-4"><tspan
@@ -773,7 +766,7 @@
          id="tspan4178-0"
          x="77.070297"
          y="140.22328"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">uCPE Device</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1"
        d="m 266.39304,242.05073 -5.00906,-38.32387"
@@ -797,45 +790,40 @@
          id="text6011-4"
          y="367.05307"
          x="37.059994"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:7.05555534px;stroke-width:0.26458332"
+           style="font-size:7.05556px;stroke-width:0.264583"
            y="367.05307"
            x="37.059994"
            id="tspan6009-5"
            sodipodi:role="line">Internet</tspan></text>
     </g>
     <g
-       transform="translate(229.03004,198.99263)"
-       id="g6108">
-      <g
-         id="g1117"
-         transform="translate(0,-6.3500003)">
-        <rect
-           style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.30122805;stroke-opacity:1"
-           id="rect5992"
-           width="54.967422"
-           height="32.516785"
-           x="8.4991493"
-           y="49.31292"
-           rx="5.9960117" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           x="35.614925"
-           y="62.470726"
-           id="text5996"><tspan
-             sodipodi:role="line"
-             id="tspan5994"
-             x="35.614925"
-             y="62.470726"
-             style="stroke-width:0.26458332">uCPE</tspan><tspan
-             sodipodi:role="line"
-             x="35.614925"
-             y="73.054062"
-             style="stroke-width:0.26458332"
-             id="tspan5998">Manager</tspan></text>
-      </g>
+       id="g222">
+      <rect
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.301228;stroke-opacity:1"
+         id="rect5992"
+         width="54.967422"
+         height="32.516785"
+         x="237.52919"
+         y="241.95555"
+         rx="5.9960117" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.76111px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="264.72488"
+         y="255.32437"
+         id="text5996"><tspan
+           sodipodi:role="line"
+           x="264.72488"
+           y="255.32437"
+           style="font-size:7.76111px;stroke-width:0.264583"
+           id="tspan5998">Enea Edge </tspan><tspan
+           sodipodi:role="line"
+           x="265.80304"
+           y="265.02576"
+           style="font-size:7.76111px;stroke-width:0.264583"
+           id="tspan216">Management </tspan></text>
     </g>
     <rect
        style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.53169465;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.06338919, 0.53169459, 0.2658473, 0.53169459;stroke-dashoffset:0;stroke-opacity:1"
@@ -855,19 +843,19 @@
        rx="7.1185279" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="262.7706"
        y="132.16495"
        id="text6054"><tspan
          sodipodi:role="line"
          x="263.74899"
          y="132.16495"
-         style="font-size:7.05555534px;stroke-width:0.26458332"
+         style="font-size:7.05556px;stroke-width:0.264583"
          id="tspan1505">Web Interface </tspan><tspan
          sodipodi:role="line"
          x="262.7706"
          y="142.74828"
-         style="font-size:4.23333311px;line-height:0;stroke-width:0.26458332"
+         style="font-size:4.23333px;line-height:0;stroke-width:0.264583"
          id="tspan2650">(128T) https://&lt;IP&gt;:60001</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1"
@@ -888,7 +876,7 @@
          rx="2.0431714" />
       <text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
          x="200.812"
          y="197.64984"
          id="text892-8"><tspan
@@ -896,7 +884,7 @@
            id="tspan890-8"
            x="200.812"
            y="197.64984"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">ibm_br</tspan></text>
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">ibm_br</tspan></text>
     </g>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -917,7 +905,7 @@
          rx="2.0431714" />
       <text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
          x="97.733612"
          y="178.01437"
          id="text892-8-9-5"><tspan
@@ -925,7 +913,7 @@
            id="tspan890-8-6-4"
            x="97.733612"
            y="178.01437"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">lan_br</tspan></text>
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">lan_br</tspan></text>
     </g>
     <g
        id="g2592"
@@ -1022,24 +1010,14 @@
              style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1" />
           <text
              xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+             style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
              x="53.59409"
              y="60.119961"
-             id="text15008-4"><tspan
-               sodipodi:role="line"
-               id="tspan15006-8"
-               x="53.59409"
-               y="69.483727"
-               style="fill:#ac9d93;stroke-width:0.26458332" /><tspan
-               sodipodi:role="line"
-               x="53.59409"
-               y="82.712898"
-               style="fill:#ac9d93;stroke-width:0.26458332"
-               id="tspan15010-2" /></text>
+             id="text15008-4" />
         </g>
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332)"
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332)"
            x="12.285738"
            y="179.02138"
            id="text4180"><tspan
@@ -1047,7 +1025,7 @@
              id="tspan4178"
              x="12.285738"
              y="179.02138"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">Test Machine</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Test Machine</tspan></text>
       </g>
     </g>
     <rect
@@ -1076,9 +1054,9 @@
            id="text892-8-9"
            y="233.89996"
            x="146.69841"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
            xml:space="preserve"><tspan
-             style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+             style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
              y="233.89996"
              x="146.69841"
              id="tspan890-8-6"
@@ -1106,35 +1084,30 @@
          id="g2216">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
            x="152.78181"
            y="190.09128"
            id="text5981"><tspan
              sodipodi:role="line"
              x="152.78181"
              y="190.09128"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
              id="tspan5983">128T</tspan></text>
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;stroke-opacity:1"
            x="153.08981"
            y="198.8871"
-           id="text5981-9"><tspan
-             sodipodi:role="line"
-             x="153.08981"
-             y="206.51349"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;stroke-opacity:1"
-             id="tspan5983-0" /></text>
+           id="text5981-9" />
       </g>
     </g>
     <text
        id="text892-8-9-5-5"
        y="178.40254"
        x="130.10648"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
        xml:space="preserve"><tspan
-         style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
          y="178.40254"
          x="130.10648"
          id="tspan890-8-6-4-2"
@@ -1143,9 +1116,9 @@
        id="text892-8-9-5-5-7"
        y="197.8927"
        x="173.88567"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
        xml:space="preserve"><tspan
-         style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
          y="197.8927"
          x="173.88567"
          id="tspan890-8-6-4-2-5"
@@ -1154,9 +1127,9 @@
        id="text892-8-9-5-5-7-6"
        y="209.60852"
        x="152.23137"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
        xml:space="preserve"><tspan
-         style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
          y="209.60852"
          x="152.23137"
          id="tspan890-8-6-4-2-5-4"
@@ -1190,7 +1163,7 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="150.01842"
        y="227.15002"
        id="text2695"><tspan
@@ -1198,10 +1171,10 @@
          id="tspan2693"
          x="150.01842"
          y="227.15002"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.1</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="150.09465"
        y="214.73219"
        id="text2695-7"><tspan
@@ -1209,10 +1182,10 @@
          id="tspan2693-9"
          x="150.09465"
          y="214.73219"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.2</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.2</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="123.06345"
        y="175.89812"
        id="text2695-5"><tspan
@@ -1220,10 +1193,10 @@
          id="tspan2693-95"
          x="123.06345"
          y="175.89812"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.1</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="53.247215"
        y="176.16252"
        id="text2695-7-0"><tspan
@@ -1231,10 +1204,10 @@
          id="tspan2693-9-4"
          x="53.247215"
          y="176.16252"
-         style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.2</tspan></text>
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.2</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="101.91634"
        y="171.6506"
        id="text2770"><tspan
@@ -1242,10 +1215,10 @@
          id="tspan2768"
          x="101.91634"
          y="171.6506"
-         style="writing-mode:lr-tb;stroke-width:0.26458332">192.168.64.0/24</tspan></text>
+         style="writing-mode:lr-tb;stroke-width:0.264583">192.168.64.0/24</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.98999999;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.99;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="141.07509"
        y="221.29282"
        id="text2770-0"><tspan
@@ -1253,6 +1226,6 @@
          id="tspan2768-4"
          x="141.07509"
          y="221.29282"
-         style="writing-mode:lr-tb;stroke-width:0.26458332">10.0.0.0/24</tspan></text>
+         style="writing-mode:lr-tb;stroke-width:0.264583">10.0.0.0/24</tspan></text>
   </g>
 </svg>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/trgt_servicechain.png b/doc/book-enea-edge-example-usecases/doc/images/trgt_servicechain.png
new file mode 100644
index 0000000..7cb5af0
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/trgt_servicechain.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg b/doc/book-enea-edge-example-usecases/doc/images/trgt_servicechain.svg
index 931bcaf..4bd6d85 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/trgt_servicechain.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,8 +13,11 @@
    viewBox="0 0 291.36588 156.51978"
    version="1.1"
    id="svg1125"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="trgt_servicechain.svg">
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="trgt_servicechain.svg"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\trgt_servicechain.png"
+   inkscape:export-xdpi="65"
+   inkscape:export-ydpi="65">
   <defs
      id="defs1119">
     <marker
@@ -518,14 +519,14 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.58"
-     inkscape:cx="375.51558"
-     inkscape:cy="323.25547"
+     inkscape:zoom="0.82024387"
+     inkscape:cx="392.43009"
+     inkscape:cy="234.25387"
      inkscape:document-units="mm"
      inkscape:current-layer="layer2"
      showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -536,7 +537,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata1122">
     <rdf:RDF>
@@ -569,7 +571,7 @@
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="Template Pieces"
-     style="display:inline"
+     style="display:none"
      transform="translate(-1.4460939,-31.103178)">
     <g
        transform="translate(-347.67938,189.67391)"
@@ -581,14 +583,14 @@
          height="18"
          width="45"
          id="rect6062"
-         style="fill:#c48ed1;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1" />
+         style="fill:#c48ed1;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" />
       <text
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -601,26 +603,26 @@
        height="59.711037"
        width="19.975622"
        id="rect6098"
-       style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.28896147;stroke-opacity:1" />
+       style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.288961;stroke-opacity:1" />
     <text
        transform="rotate(90)"
        id="text892"
        y="193.61693"
        x="311.6983"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        xml:space="preserve"><tspan
-         style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+         style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
          y="193.61693"
          x="311.6983"
          id="tspan890"
          sodipodi:role="line">OVS Bridge</tspan></text>
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.00000003, 0.50000003, 0.25, 0.50000003;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 0.5, 0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1"
        d="m -149.19921,310.00051 h 34.52812"
        id="path8471"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.00000004, 0.50000003, 0.25, 0.50000003;stroke-dashoffset:0;stroke-opacity:1"
+       style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1, 0.5, 0.25, 0.5;stroke-dashoffset:0;stroke-opacity:1"
        d="M -104.61691,328.32292 V 293.7948"
        id="path8471-3"
        inkscape:connector-curvature="0" />
@@ -635,37 +637,37 @@
        id="path8471-3-2-4"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
        d="m -142.20667,270.65304 h 37.32518"
        id="path6121"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-9-9)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-9-9)"
        d="m -142.15413,276.6677 h 37.32519"
        id="path6121-4"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-7-1)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-7-1)"
        d="m -99.555704,258.89146 21.35958,30.60942"
        id="path6121-4-7"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-1-4-0)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-1-4-0)"
        d="m -53.814264,258.73079 -21.35958,30.60942"
        id="path6121-4-7-5"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:0.26499999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-4-9-5-1)"
+       style="fill:none;stroke:#000000;stroke-width:0.265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#Arrow2Lstart-2-4-9-5-1)"
        d="m -77.254954,275.59103 -21.35958,-30.60942"
        id="path6121-4-7-3-6"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#777777;fill-opacity:1;stroke:#777777;stroke-width:1.22399998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-6-0)"
+       style="fill:#777777;fill-opacity:1;stroke:#777777;stroke-width:1.224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-6-0)"
        d="m -144.36842,344.40951 h 22.4813"
        id="path899"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:1.22399998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-0-9)"
+       style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:1.224;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-0-9)"
        d="m -113.08989,344.13177 h 22.481306"
        id="path899-9"
        inkscape:connector-curvature="0" />
@@ -688,13 +690,13 @@
            inkscape:connector-curvature="0" />
         <path
            transform="translate(-3.1511298,-3.7216363)"
-           style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:0.59490627;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-9-0-3)"
+           style="fill:#d26f6f;fill-opacity:1;stroke:#d26f6f;stroke-width:0.594906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#EmptyTriangleOutL-0-9-0-3)"
            d="m 108.80427,115.85976 h 10.92006"
            id="path899-9-2"
            inkscape:connector-curvature="0" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -702,39 +704,37 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="307.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="307.47116"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4348">- Connection via cloud/internet:</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="330.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="330.80453"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4350">- Back to Back: BTB</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="354.13779"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="354.13791"
+             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4651">- Flow rules: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="377.47113"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="377.47128"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
-             y="400.80444"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             y="400.80466"
              id="tspan4342" /></text>
       </g>
     </g>
     <g
        transform="translate(-414.95854,87.627341)"
        id="g1489-5"
-       style="stroke:#000000;stroke-opacity:1;fill:#ab9d92;fill-opacity:0.64313728">
+       style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-opacity:1">
       <rect
          rx="6.4529891"
          y="118.30851"
@@ -742,18 +742,13 @@
          height="29.760508"
          width="51.623913"
          id="rect6039-1"
-         style="fill:#ab9d92;fill-opacity:0.64313728;stroke:#000000;stroke-width:0.41066644;stroke-opacity:1" />
+         style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.410666;stroke-opacity:1" />
       <text
          id="text6054-9"
          y="127.71474"
          x="262.66827"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666667px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.64313728;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1"
-         xml:space="preserve"><tspan
-           id="tspan1479-0"
-           style="font-size:8.46666667px;line-height:5px;stroke-width:0.26458332;stroke:#000000;stroke-opacity:1;fill:#ab9d92;fill-opacity:0.64313728"
-           y="132.54945"
-           x="262.66827"
-           sodipodi:role="line" /></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.264583;stroke-opacity:1"
+         xml:space="preserve" />
     </g>
   </g>
   <g
@@ -761,685 +756,647 @@
      id="layer2"
      inkscape:label="Trgt Schema"
      transform="translate(-1.4460939,-118.10318)">
-    <g
-       id="g2821">
-      <flowRoot
-         transform="matrix(0.26458333,0,0,0.26458333,0,87)"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-         id="flowRoot949"
-         xml:space="preserve"><flowRegion
-           id="flowRegion951"><rect
-             y="137.70079"
-             x="872"
-             height="25.079741"
-             width="201.71744"
-             id="rect953" /></flowRegion><flowPara
-           id="flowPara955" /></flowRoot>      <text
-         id="text947"
-         y="127.42318"
-         x="253.30237"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:5.64444447px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="133.14297"
-           x="253.30237"
-           id="tspan945"
-           sodipodi:role="line" /></text>
-      <text
-         id="text4180-4"
+    <flowRoot
+       transform="matrix(0.26458333,0,0,0.26458333,0,87)"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       id="flowRoot949"
+       xml:space="preserve"><flowRegion
+         id="flowRegion951"><rect
+           y="137.70079"
+           x="872"
+           height="25.079741"
+           width="201.71744"
+           id="rect953" /></flowRegion><flowPara
+         id="flowPara955" /></flowRoot>
+    <text
+       id="text947"
+       y="127.42318"
+       x="253.30237"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve" />
+    <text
+       id="text4180-4"
+       y="140.75244"
+       x="-26.646427"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332-7)"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
          y="140.75244"
          x="-26.646427"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332-7)"
-         xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
-           y="140.75244"
-           x="-26.646427"
-           id="tspan4178-0"
-           sodipodi:role="line">uCPE Device</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-9"
-         d="m 266.39304,242.05073 -5.00906,-38.32387"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-9-0"
-         d="m 268.53365,148.2789 -5.00906,38.32387"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000002, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5091-2"
-         d="m 265.1663,184.81589 a 10.213003,8.6845435 0 0 0 -6.68017,2.12972 7.3267194,4.8471871 0 0 0 -1.53463,-0.11005 7.3267194,4.8471871 0 0 0 -6.28296,2.36481 10.172598,7.1157176 0 0 0 -1.00344,-0.0351 10.172598,7.1157176 0 0 0 -10.17267,7.11576 10.172598,7.1157176 0 0 0 2.74795,4.85586 5.1065016,3.4334242 0 0 0 -0.16434,0.84612 5.1065016,3.4334242 0 0 0 5.10649,3.43343 5.1065016,3.4334242 0 0 0 1.79049,-0.21972 4.662458,5.6550516 0 0 0 3.09399,1.43152 4.662458,5.6550516 0 0 0 2.64388,-1.00471 8.4368287,6.0589839 0 0 0 6.01497,1.81257 8.4368287,6.0589839 0 0 0 6.52493,-2.22359 12.433222,5.0491531 0 0 0 5.9083,0.60786 12.433222,5.0491531 0 0 0 12.43322,-5.04915 12.433222,5.0491531 0 0 0 -0.73936,-1.70053 9.6231236,5.6550516 0 0 0 3.11178,-4.15649 9.6231236,5.6550516 0 0 0 -9.62282,-5.65505 9.6231236,5.6550516 0 0 0 -3.96431,0.50965 10.213003,8.6845435 0 0 0 -9.2113,-4.9529 z"
-         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.19981423;stroke-opacity:1;filter:url(#filter4332-6)" />
-      <text
-         id="text6011-4"
+         id="tspan4178-0"
+         sodipodi:role="line">uCPE Device</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-9"
+       d="m 266.39304,242.05073 -5.00906,-38.32387"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-9-0"
+       d="m 268.53365,148.2789 -5.00906,38.32387"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5091-2"
+       d="m 265.1663,184.81589 a 10.213003,8.6845435 0 0 0 -6.68017,2.12972 7.3267194,4.8471871 0 0 0 -1.53463,-0.11005 7.3267194,4.8471871 0 0 0 -6.28296,2.36481 10.172598,7.1157176 0 0 0 -1.00344,-0.0351 10.172598,7.1157176 0 0 0 -10.17267,7.11576 10.172598,7.1157176 0 0 0 2.74795,4.85586 5.1065016,3.4334242 0 0 0 -0.16434,0.84612 5.1065016,3.4334242 0 0 0 5.10649,3.43343 5.1065016,3.4334242 0 0 0 1.79049,-0.21972 4.662458,5.6550516 0 0 0 3.09399,1.43152 4.662458,5.6550516 0 0 0 2.64388,-1.00471 8.4368287,6.0589839 0 0 0 6.01497,1.81257 8.4368287,6.0589839 0 0 0 6.52493,-2.22359 12.433222,5.0491531 0 0 0 5.9083,0.60786 12.433222,5.0491531 0 0 0 12.43322,-5.04915 12.433222,5.0491531 0 0 0 -0.73936,-1.70053 9.6231236,5.6550516 0 0 0 3.11178,-4.15649 9.6231236,5.6550516 0 0 0 -9.62282,-5.65505 9.6231236,5.6550516 0 0 0 -3.96431,0.50965 10.213003,8.6845435 0 0 0 -9.2113,-4.9529 z"
+       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.199814;stroke-opacity:1;filter:url(#filter4332-6)" />
+    <text
+       id="text6011-4"
+       y="198.60991"
+       x="263.42371"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332-6)"
+       xml:space="preserve"><tspan
+         style="font-size:7.05556px;stroke-width:0.264583"
          y="198.60991"
          x="263.42371"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332-6)"
-         xml:space="preserve"><tspan
-           style="font-size:7.05555534px;stroke-width:0.26458332"
-           y="198.60991"
-           x="263.42371"
-           id="tspan6009-5"
-           sodipodi:role="line">Internet</tspan></text>
-      <g
-         id="g6108"
-         transform="translate(229.03004,198.99263)">
-        <g
-           transform="translate(0,-6.3500003)"
-           id="g1117">
-          <rect
-             rx="5.9960117"
-             y="49.31292"
-             x="8.4991493"
-             height="32.516785"
-             width="54.967422"
-             id="rect5992"
-             style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.30122805;stroke-opacity:1" />
-          <text
-             id="text5996"
-             y="62.470726"
-             x="35.614925"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-             xml:space="preserve"><tspan
-               style="stroke-width:0.26458332"
-               y="62.470726"
-               x="35.614925"
-               id="tspan5994"
-               sodipodi:role="line">uCPE</tspan><tspan
-               id="tspan5998"
-               style="stroke-width:0.26458332"
-               y="73.054062"
-               x="35.614925"
-               sodipodi:role="line">Manager</tspan></text>
-        </g>
-      </g>
+         id="tspan6009-5"
+         sodipodi:role="line">Internet</tspan></text>
+    <g
+       id="g376">
       <rect
-         rx="16.325657"
-         y="144.03362"
-         x="-26.00753"
-         height="101.71231"
-         width="255.02283"
-         id="rect2700"
-         style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.68559104;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.37118189, 0.68559094, 0.34279548, 0.68559094;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64"
-         d="m 115.10448,236.3616 90.22324,-35.73878"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <g
-         transform="translate(4.2333335,1.1204851e-6)"
-         id="g2676">
-        <rect
-           rx="2.0431714"
-           y="188.76456"
-           x="-200.64168"
-           height="24.429752"
-           width="8.1726856"
-           id="rect6098-9"
-           style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.11822366;stroke-opacity:1"
-           transform="rotate(-90)" />
-        <text
-           id="text892-8"
-           y="197.64984"
-           x="200.812"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
-           xml:space="preserve"><tspan
-             style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
-             y="197.64984"
-             x="200.812"
-             id="tspan890-8"
-             sodipodi:role="line">ibm_br</tspan></text>
-      </g>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3"
-         d="m 77.127442,176.91943 h 12.828"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         rx="5.9960117"
+         y="241.95555"
+         x="237.52919"
+         height="32.516785"
+         width="54.967422"
+         id="rect5992"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.301228;stroke-opacity:1" />
+      <text
+         id="text5996"
+         y="255.32437"
+         x="264.72488"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.76111px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         xml:space="preserve"><tspan
+           id="tspan5998"
+           style="font-size:7.76111px;stroke-width:0.264583"
+           y="255.32437"
+           x="264.72488"
+           sodipodi:role="line">Enea Edge </tspan><tspan
+           style="font-size:7.76111px;stroke-width:0.264583"
+           y="265.02576"
+           x="265.80304"
+           sodipodi:role="line"
+           id="tspan370">Management </tspan></text>
+    </g>
+    <rect
+       rx="16.325657"
+       y="144.03362"
+       x="-26.00753"
+       height="101.71231"
+       width="255.02283"
+       id="rect2700"
+       style="vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.685591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.37118, 0.685591, 0.342795, 0.685591;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64"
+       d="m 115.10448,236.3616 90.22324,-35.73878"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       transform="translate(4.2333335)"
+       id="g2676">
       <rect
-         transform="rotate(-90)"
-         style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.11822366;stroke-opacity:1"
-         id="rect6098-9-6-2"
-         width="8.1726856"
+         rx="2.0431714"
+         y="188.76456"
+         x="-200.64168"
          height="24.429752"
-         x="-181.00621"
-         y="89.828568"
-         rx="2.0431714" />
+         width="8.1726856"
+         id="rect6098-9"
+         style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.118224;stroke-opacity:1"
+         transform="rotate(-90)" />
       <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         id="text892-8"
+         y="197.64984"
+         x="200.812"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+         xml:space="preserve"><tspan
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
+           y="197.64984"
+           x="200.812"
+           id="tspan890-8"
+           sodipodi:role="line">ibm_br</tspan></text>
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3"
+       d="m 77.127442,176.91943 h 12.828"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       transform="rotate(-90)"
+       style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.118224;stroke-opacity:1"
+       id="rect6098-9-6-2"
+       width="8.1726856"
+       height="24.429752"
+       x="-181.00621"
+       y="89.828568"
+       rx="2.0431714" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="101.88118"
+       y="178.01437"
+       id="text892-8-9-5"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4"
          x="101.88118"
          y="178.01437"
-         id="text892-8-9-5"><tspan
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">lsfc_br</tspan></text>
+    <rect
+       rx="6"
+       y="154.01778"
+       x="125.00951"
+       height="57.062046"
+       width="54.62989"
+       id="rect5977"
+       style="fill:#72b500;fill-opacity:0.839216;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" />
+    <g
+       transform="translate(-1.5662411,-4.5514539)"
+       id="g2216">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="153.00713"
+         y="180.28951"
+         id="text5981" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="153.51656"
+         y="193.33939"
+         id="text5981-9"><tspan
            sodipodi:role="line"
-           id="tspan890-8-6-4"
-           x="101.88118"
-           y="178.01437"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">lsfc_br</tspan></text>
-      <rect
-         rx="6"
-         y="154.01778"
-         x="125.00951"
-         height="57.062046"
-         width="54.62989"
-         id="rect5977"
-         style="fill:#72b500;fill-opacity:0.8392157;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1" />
-      <g
-         transform="translate(-1.5662411,-4.5514539)"
-         id="g2216">
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           x="153.00713"
-           y="180.28951"
-           id="text5981"><tspan
-             sodipodi:role="line"
-             x="153.00713"
-             y="187.91589"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983" /></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
            x="153.51656"
            y="193.33939"
-           id="text5981-9"><tspan
-             sodipodi:role="line"
-             x="153.51656"
-             y="193.33939"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983-0">128T</tspan></text>
-      </g>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
+           id="tspan5983-0">128T</tspan></text>
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="130.10648"
+       y="178.40254"
+       id="text892-8-9-5-5"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2"
          x="130.10648"
          y="178.40254"
-         id="text892-8-9-5-5"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2"
-           x="130.10648"
-           y="178.40254"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">LAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">LAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="173.88567"
+       y="197.8927"
+       id="text892-8-9-5-5-7"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5"
          x="173.88567"
          y="197.8927"
-         id="text892-8-9-5-5-7"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5"
-           x="173.88567"
-           y="197.8927"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">WAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">WAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="152.23137"
+       y="209.60852"
+       id="text892-8-9-5-5-7-6"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5-4"
          x="152.23137"
          y="209.60852"
-         id="text892-8-9-5-5-7-6"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5-4"
-           x="152.23137"
-           y="209.60852"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">MGMT</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-1"
-         d="m 114.43454,176.90997 h 10.528"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-1-3"
-         d="m 179.82558,196.6529 h 13.128"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-6-0"
-         d="m 217.53236,196.67 h 21.928"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.60000001, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="192.75043"
-         x="227.74036"
-         height="7.845396"
-         width="2.5537291"
-         id="rect2227-5"
-         style="opacity:1;vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.3275212;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text2695-7"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">MGMT</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-1"
+       d="m 114.43454,176.90997 h 10.528"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-1-3"
+       d="m 179.82558,196.6529 h 13.128"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-6-0"
+       d="m 217.53236,196.67 h 21.928"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       y="192.75043"
+       x="227.74036"
+       height="7.845396"
+       width="2.5537291"
+       id="rect2227-5"
+       style="vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.327521;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <text
+       id="text2695-7"
+       y="214.73219"
+       x="150.09465"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="214.73219"
          x="150.09465"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="214.73219"
-           x="150.09465"
-           id="tspan2693-9"
-           sodipodi:role="line">.2</tspan></text>
-      <text
-         id="text2695-5"
+         id="tspan2693-9"
+         sodipodi:role="line">.2</tspan></text>
+    <text
+       id="text2695-5"
+       y="175.89812"
+       x="123.06345"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="175.89812"
          x="123.06345"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="175.89812"
-           x="123.06345"
-           id="tspan2693-95"
-           sodipodi:role="line">.1</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-14"
-         d="m -25.47561,176.91943 h 12.828"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="172.71829"
-         x="-27.148451"
-         height="7.9598031"
-         width="2.5477617"
-         id="rect2227"
-         style="opacity:1;vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.32951498;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         id="tspan2693-95"
+         sodipodi:role="line">.1</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-14"
+       d="m -25.47561,176.91943 h 12.828"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       y="172.71829"
+       x="-27.148451"
+       height="7.9598031"
+       width="2.5477617"
+       id="rect2227"
+       style="vector-effect:none;fill:#ffff01;fill-opacity:1;stroke:#000000;stroke-width:0.329515;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       id="g1660">
       <g
-         id="g1660">
+         id="g2177"
+         transform="matrix(0.36573648,0,0,0.36628718,-55.69298,80.968281)">
         <g
-           id="g2177"
-           transform="matrix(0.36573648,0,0,0.36628718,-55.69298,80.968281)">
+           id="g2160">
+          <path
+             style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             d="m 14.089065,261.95608 h 48.428"
+             id="path8471-3-2-4-2"
+             inkscape:connector-curvature="0" />
           <g
-             id="g2160">
-            <path
-               style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-               d="m 14.089065,261.95608 h 48.428"
-               id="path8471-3-2-4-2"
-               inkscape:connector-curvature="0" />
+             id="g2136"
+             transform="translate(-0.08009955)">
             <g
-               id="g2136"
-               transform="translate(-0.08009955)">
+               id="g2102">
               <g
-                 id="g2102">
-                <g
-                   id="g2086">
-                  <path
-                     inkscape:connector-curvature="0"
-                     id="path8471-3-2-4-2-9"
-                     d="m 50.199738,174.82006 v 4.928"
-                     style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-                     transform="translate(0,87)" />
-                  <rect
-                     y="266.31744"
-                     x="42.699738"
-                     height="15"
-                     width="15"
-                     id="rect1948-6"
-                     style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-                </g>
-              </g>
-              <g
-                 id="g2102-4"
-                 transform="translate(-23.633146)">
-                <g
-                   id="g2086-8">
-                  <path
-                     inkscape:connector-curvature="0"
-                     id="path8471-3-2-4-2-9-0"
-                     d="m 50.199738,174.82006 v 4.928"
-                     style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-                     transform="translate(0,87)" />
-                  <rect
-                     y="266.31744"
-                     x="42.699738"
-                     height="15"
-                     width="15"
-                     id="rect1948-6-3"
-                     style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-                </g>
+                 id="g2086">
+                <path
+                   inkscape:connector-curvature="0"
+                   id="path8471-3-2-4-2-9"
+                   d="m 50.199738,174.82006 v 4.928"
+                   style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                   transform="translate(0,87)" />
+                <rect
+                   y="266.31744"
+                   x="42.699738"
+                   height="15"
+                   width="15"
+                   id="rect1948-6"
+                   style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
               </g>
             </g>
-          </g>
-          <g
-             id="g2102-9"
-             transform="rotate(180,44.251401,261.95726)">
             <g
-               id="g2086-4">
-              <path
-                 inkscape:connector-curvature="0"
-                 id="path8471-3-2-4-2-9-7"
-                 d="m 50.199738,174.82006 v 4.928"
-                 style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-                 transform="translate(0,87)" />
-              <rect
-                 y="266.31744"
-                 x="42.699738"
-                 height="15"
-                 width="15"
-                 id="rect1948-6-4"
-                 style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+               id="g2102-4"
+               transform="translate(-23.633146)">
+              <g
+                 id="g2086-8">
+                <path
+                   inkscape:connector-curvature="0"
+                   id="path8471-3-2-4-2-9-0"
+                   d="m 50.199738,174.82006 v 4.928"
+                   style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+                   transform="translate(0,87)" />
+                <rect
+                   y="266.31744"
+                   x="42.699738"
+                   height="15"
+                   width="15"
+                   id="rect1948-6-3"
+                   style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+              </g>
             </g>
           </g>
         </g>
         <g
-           style="fill:#ac9d93;filter:url(#filter4332)"
-           id="g6108-0"
-           transform="matrix(0.81278123,0,0,0.7263691,-101.76052,132.55338)">
-          <rect
-             rx="6.0006089"
-             y="49.061516"
-             x="8.1325779"
-             height="24.0366"
-             width="55.009563"
-             id="rect5992-4"
-             style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1" />
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-             x="53.59409"
-             y="60.119961"
-             id="text15008-4"><tspan
-               sodipodi:role="line"
-               id="tspan15006-8"
-               x="53.59409"
-               y="69.483727"
-               style="fill:#ac9d93;stroke-width:0.26458332" /><tspan
-               sodipodi:role="line"
-               x="53.59409"
-               y="82.712898"
-               style="fill:#ac9d93;stroke-width:0.26458332"
-               id="tspan15010-2" /></text>
+           id="g2102-9"
+           transform="rotate(180,44.251401,261.95726)">
+          <g
+             id="g2086-4">
+            <path
+               inkscape:connector-curvature="0"
+               id="path8471-3-2-4-2-9-7"
+               d="m 50.199738,174.82006 v 4.928"
+               style="display:inline;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               transform="translate(0,87)" />
+            <rect
+               y="266.31744"
+               x="42.699738"
+               height="15"
+               width="15"
+               id="rect1948-6-4"
+               style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+          </g>
         </g>
+      </g>
+      <g
+         style="fill:#ac9d93;filter:url(#filter4332)"
+         id="g6108-0"
+         transform="matrix(0.81278123,0,0,0.7263691,-101.76052,132.55338)">
+        <rect
+           rx="6.0006089"
+           y="49.061516"
+           x="8.1325779"
+           height="24.0366"
+           width="55.009563"
+           id="rect5992-4"
+           style="fill:#ac9d93;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;filter:url(#filter4332)"
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           x="53.59409"
+           y="60.119961"
+           id="text15008-4" />
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;filter:url(#filter4332)"
+         x="12.285738"
+         y="179.02138"
+         id="text4180"
+         transform="matrix(0.99862164,0,0,1.0001253,-103.17944,-0.02216172)"><tspan
+           sodipodi:role="line"
+           id="tspan4178"
            x="12.285738"
            y="179.02138"
-           id="text4180"
-           transform="matrix(0.99862164,0,0,1.0001253,-103.17944,-0.02216172)"><tspan
-             sodipodi:role="line"
-             id="tspan4178"
-             x="12.285738"
-             y="179.02138"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">Test Machine</tspan></text>
-        <path
-           style="display:inline;fill:none;stroke:#000000;stroke-width:0.29981196;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.59962392, 0.29981196, 0.14990598, 0.29981196;stroke-dashoffset:0;stroke-opacity:1"
-           d="m -33.356642,176.91944 h 6.319277"
-           id="path8471-3-6-0-7"
-           inkscape:connector-curvature="0" />
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52556634px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26441747"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Test Machine</tspan></text>
+      <path
+         style="display:inline;fill:none;stroke:#000000;stroke-width:0.299812;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.599624, 0.299812, 0.149906, 0.299812;stroke-dashoffset:0;stroke-opacity:1"
+         d="m -33.356642,176.91944 h 6.319277"
+         id="path8471-3-6-0-7"
+         inkscape:connector-curvature="0" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52557px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264417"
+         x="-47.92791"
+         y="176.02995"
+         id="text2695-7-0"
+         transform="scale(0.99924797,1.0007526)"><tspan
+           sodipodi:role="line"
+           id="tspan2693-9-4"
            x="-47.92791"
            y="176.02995"
-           id="text2695-7-0"
-           transform="scale(0.99924797,1.0007526)"><tspan
-             sodipodi:role="line"
-             id="tspan2693-9-4"
-             x="-47.92791"
-             y="176.02995"
-             style="font-size:3.52556634px;writing-mode:lr-tb;stroke-width:0.26441747">.2</tspan></text>
-      </g>
-      <text
-         id="text2770"
+           style="font-size:3.52557px;writing-mode:lr-tb;stroke-width:0.264417">.2</tspan></text>
+    </g>
+    <text
+       id="text2770"
+       y="171.6506"
+       x="101.91634"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="writing-mode:lr-tb;stroke-width:0.264583"
          y="171.6506"
          x="101.91634"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="writing-mode:lr-tb;stroke-width:0.26458332"
-           y="171.6506"
-           x="101.91634"
-           id="tspan2768"
-           sodipodi:role="line">192.168.64.0/24</tspan></text>
+         id="tspan2768"
+         sodipodi:role="line">192.168.64.0/24</tspan></text>
+    <g
+       transform="translate(12.876938,3.7041668)"
+       id="g1953">
       <g
-         transform="translate(12.876938,3.7041668)"
-         id="g1953">
-        <g
-           id="g2691"
-           transform="translate(-58.125198,-0.52916555)">
-          <rect
-             transform="rotate(-90)"
-             style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.1247495;stroke-opacity:1"
-             id="rect6098-9-6"
-             width="8.1726856"
-             height="27.201187"
-             x="-236.89076"
-             y="133.15155"
-             rx="2.0431714" />
-          <text
-             xml:space="preserve"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
-             x="146.69841"
-             y="233.89996"
-             id="text892-8-9"><tspan
-               sodipodi:role="line"
-               id="tspan890-8-6"
-               x="146.69841"
-               y="233.89996"
-               style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">vnf_mgmt_br</tspan></text>
-        </g>
+         id="g2691"
+         transform="translate(-58.125198,-0.52916555)">
+        <rect
+           transform="rotate(-90)"
+           style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.124749;stroke-opacity:1"
+           id="rect6098-9-6"
+           width="8.1726856"
+           height="27.201187"
+           x="-236.89076"
+           y="133.15155"
+           rx="2.0431714" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+           x="146.69841"
+           y="233.89996"
+           id="text892-8-9"><tspan
+             sodipodi:role="line"
+             id="tspan890-8-6"
+             x="146.69841"
+             y="233.89996"
+             style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">vnf_mgmt_br</tspan></text>
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="88.791451"
+         y="227.15002"
+         id="text2695"><tspan
+           sodipodi:role="line"
+           id="tspan2693"
            x="88.791451"
            y="227.15002"
-           id="text2695"><tspan
-             sodipodi:role="line"
-             id="tspan2693"
-             x="88.791451"
-             y="227.15002"
-             style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332">.1</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.98999999;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583">.1</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;opacity:0.99;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="88.499825"
+         y="221.29282"
+         id="text2770-0"><tspan
+           sodipodi:role="line"
+           id="tspan2768-4"
            x="88.499825"
            y="221.29282"
-           id="text2770-0"><tspan
-             sodipodi:role="line"
-             id="tspan2768-4"
-             x="88.499825"
-             y="221.29282"
-             style="writing-mode:lr-tb;stroke-width:0.26458332">10.0.0.0/24</tspan></text>
-      </g>
-      <g
-         transform="translate(-98.455487)"
-         id="g2766-9">
-        <rect
-           rx="2.0431714"
-           y="85.681"
-           x="-181.00621"
-           height="24.429752"
-           width="8.1726856"
-           id="rect6098-9-6-2-9"
-           style="fill:#ffd32a;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.11822366;stroke-opacity:1"
-           transform="rotate(-90)" />
-        <text
-           id="text892-8-9-5-6"
+           style="writing-mode:lr-tb;stroke-width:0.264583">10.0.0.0/24</tspan></text>
+    </g>
+    <g
+       transform="translate(-98.455487)"
+       id="g2766-9">
+      <rect
+         rx="2.0431714"
+         y="85.681"
+         x="-181.00621"
+         height="24.429752"
+         width="8.1726856"
+         id="rect6098-9-6-2-9"
+         style="fill:#ffd32a;fill-opacity:0.643137;stroke:#000000;stroke-width:0.118224;stroke-opacity:1"
+         transform="rotate(-90)" />
+      <text
+         id="text892-8-9-5-6"
+         y="178.01437"
+         x="97.733612"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+         xml:space="preserve"><tspan
+           style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825"
            y="178.01437"
            x="97.733612"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
-           xml:space="preserve"><tspan
-             style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975"
-             y="178.01437"
-             x="97.733612"
-             id="tspan890-8-6-4-1"
-             sodipodi:role="line">lan_br</tspan></text>
-      </g>
-      <rect
-         rx="6"
-         y="154.01778"
-         x="22.406458"
-         height="57.062046"
-         width="54.62989"
-         id="rect5977-0"
-         style="fill:#89c129;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1" />
-      <g
-         transform="translate(-102.85171,17.778478)"
-         id="g2216-0">
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           id="tspan890-8-6-4-1"
+           sodipodi:role="line">lan_br</tspan></text>
+    </g>
+    <rect
+       rx="6"
+       y="154.01778"
+       x="22.406458"
+       height="57.062046"
+       width="54.62989"
+       id="rect5977-0"
+       style="fill:#89c129;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" />
+    <g
+       transform="translate(-102.85171,17.778478)"
+       id="g2216-0">
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="152.40361"
+         y="171.23683"
+         id="text5981-2"><tspan
+           sodipodi:role="line"
            x="152.40361"
            y="171.23683"
-           id="text5981-2"><tspan
-             sodipodi:role="line"
-             x="152.40361"
-             y="171.23683"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983-8">Fortigate</tspan></text>
-        <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           x="153.08981"
-           y="198.8871"
-           id="text5981-9-6"><tspan
-             sodipodi:role="line"
-             x="153.08981"
-             y="206.51349"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
-             id="tspan5983-0-9" /></text>
-      </g>
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
+           id="tspan5983-8">Fortigate</tspan></text>
       <text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="153.08981"
+         y="198.8871"
+         id="text5981-9-6" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="27.503428"
+       y="178.40254"
+       id="text892-8-9-5-5-8"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-3"
          x="27.503428"
          y="178.40254"
-         id="text892-8-9-5-5-8"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-3"
-           x="27.503428"
-           y="178.40254"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">LAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">LAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="71.282616"
+       y="178.3138"
+       id="text892-8-9-5-5-7-2"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5-6"
          x="71.282616"
          y="178.3138"
-         id="text892-8-9-5-5-7-2"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5-6"
-           x="71.282616"
-           y="178.3138"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">WAN</tspan></text>
-      <text
-         xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399212px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10824975"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">WAN</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.46399px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.10825"
+       x="49.628311"
+       y="209.60852"
+       id="text892-8-9-5-5-7-6-9"><tspan
+         sodipodi:role="line"
+         id="tspan890-8-6-4-2-5-4-4"
          x="49.628311"
          y="209.60852"
-         id="text892-8-9-5-5-7-6-9"><tspan
-           sodipodi:role="line"
-           id="tspan890-8-6-4-2-5-4-4"
-           x="49.628311"
-           y="209.60852"
-           style="font-size:4.23333311px;writing-mode:lr-tb;stroke-width:0.10824975">MGMT</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-2-4-3-1-38"
-         d="M 11.831489,176.90997 H 22.359488"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         id="text2695-7-8"
+         style="font-size:4.23333px;writing-mode:lr-tb;stroke-width:0.10825">MGMT</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-2-4-3-1-38"
+       d="M 11.831489,176.90997 H 22.359488"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <text
+       id="text2695-7-8"
+       y="214.73219"
+       x="47.4916"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="214.73219"
          x="47.4916"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="214.73219"
-           x="47.4916"
-           id="tspan2693-9-0"
-           sodipodi:role="line">.3</tspan></text>
-      <text
-         id="text2695-5-2"
+         id="tspan2693-9-0"
+         sodipodi:role="line">.3</tspan></text>
+    <text
+       id="text2695-5-2"
+       y="175.89812"
+       x="20.460402"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="font-size:3.52778px;writing-mode:lr-tb;stroke-width:0.264583"
          y="175.89812"
          x="20.460402"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="font-size:3.52777767px;writing-mode:lr-tb;stroke-width:0.26458332"
-           y="175.89812"
-           x="20.460402"
-           id="tspan2693-95-4"
-           sodipodi:role="line">.1</tspan></text>
-      <text
-         id="text2770-9"
+         id="tspan2693-95-4"
+         sodipodi:role="line">.1</tspan></text>
+    <text
+       id="text2770-9"
+       y="171.6506"
+       x="-0.68670934"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       xml:space="preserve"><tspan
+         style="writing-mode:lr-tb;stroke-width:0.264583"
          y="171.6506"
-         x="-0.68670934"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-         xml:space="preserve"><tspan
-           style="writing-mode:lr-tb;stroke-width:0.26458332"
-           y="171.6506"
-           x="-0.68670976"
-           id="tspan2768-8"
-           sodipodi:role="line">172.16.1.0/24</tspan></text>
-      <text
-         transform="scale(0.99924797,1.0007526)"
-         id="text2695-7-0-8"
+         x="-0.6867094"
+         id="tspan2768-8"
+         sodipodi:role="line">172.16.1.0/24</tspan></text>
+    <text
+       transform="scale(0.99924797,1.0007526)"
+       id="text2695-7-0-8"
+       y="176.02995"
+       x="79.167603"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52557px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264417"
+       xml:space="preserve"><tspan
+         style="font-size:3.52557px;writing-mode:lr-tb;stroke-width:0.264417"
          y="176.02995"
          x="79.167603"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52556634px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26441747"
-         xml:space="preserve"><tspan
-           style="font-size:3.52556634px;writing-mode:lr-tb;stroke-width:0.26441747"
-           y="176.02995"
-           x="79.167603"
-           id="tspan2693-9-4-7"
-           sodipodi:role="line">.2</tspan></text>
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-5"
-         d="M 87.805429,236.23645 49.787296,211.32258"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path8471-3-64-53"
-         d="M 115.00864,236.45949 149.76744,211.266"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+         id="tspan2693-9-4-7"
+         sodipodi:role="line">.2</tspan></text>
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-5"
+       d="M 87.805429,236.23645 49.787296,211.32258"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path8471-3-64-53"
+       d="M 115.00864,236.45949 149.76744,211.266"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.3, 0.15, 0.3;stroke-dashoffset:0;stroke-opacity:1" />
+    <g
+       id="g2693">
       <g
-         id="g2693">
-        <g
-           id="g1489"
-           style="fill:#ab9d92;fill-opacity:0.64313725"
-           transform="matrix(1.2261286,0,0,1.052617,-59.360811,-7.5277952)">
-          <rect
-             rx="6.4529891"
-             y="118.30851"
-             x="236.69716"
-             height="29.760508"
-             width="51.623913"
-             id="rect6039"
-             style="fill:#ab9d92;fill-opacity:0.64313725;stroke:#000000;stroke-width:0.41066644;stroke-opacity:1" />
-          <text
-             id="text6054"
-             y="127.71474"
-             x="262.66827"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.64313725;stroke:none;stroke-width:0.26458332"
-             xml:space="preserve"><tspan
-               id="tspan1479"
-               style="font-size:4.23333311px;line-height:5px;fill:#ab9d92;fill-opacity:0.64313725;stroke-width:0.26458332"
-               y="132.54945"
-               x="262.66827"
-               sodipodi:role="line" /></text>
-        </g>
+         id="g1489"
+         style="fill:#ab9d92;fill-opacity:0.643137"
+         transform="matrix(1.2261286,0,0,1.052617,-59.360811,-7.5277952)">
+        <rect
+           rx="6.4529891"
+           y="118.30851"
+           x="236.69716"
+           height="29.760508"
+           width="51.623913"
+           id="rect6039"
+           style="fill:#ab9d92;fill-opacity:0.643137;stroke:#000000;stroke-width:0.410666;stroke-opacity:1" />
         <text
-           xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           id="text6054"
+           y="127.71474"
+           x="262.66827"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:5px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ab9d92;fill-opacity:0.643137;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
+      </g>
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="262.49362"
+         y="126.3615"
+         id="text1719"><tspan
+           sodipodi:role="line"
            x="262.49362"
            y="126.3615"
-           id="text1719"><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="126.3615"
-             style="font-size:7.05555534px;writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1727">Web Interface</tspan><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="132.63882"
-             style="writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1721" /><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="137.9305"
-             style="writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1723">(128T) https://&lt;IP&gt;:60001</tspan><tspan
-             sodipodi:role="line"
-             x="262.49362"
-             y="143.22215"
-             style="writing-mode:lr-tb;stroke-width:0.26458332"
-             id="tspan1725">(Fortigate) https://&lt;IP&gt;:60002</tspan></text>
-      </g>
+           style="font-size:7.05556px;writing-mode:lr-tb;stroke-width:0.264583"
+           id="tspan1727">Web Interface</tspan><tspan
+           sodipodi:role="line"
+           x="262.49362"
+           y="132.63882"
+           id="tspan1721" /><tspan
+           sodipodi:role="line"
+           x="262.49362"
+           y="137.93048"
+           style="writing-mode:lr-tb;stroke-width:0.264583"
+           id="tspan1723">(128T) https://&lt;IP&gt;:60001</tspan><tspan
+           sodipodi:role="line"
+           x="262.49362"
+           y="143.22214"
+           style="writing-mode:lr-tb;stroke-width:0.264583"
+           id="tspan1725">(Fortigate) https://&lt;IP&gt;:60002</tspan></text>
     </g>
   </g>
 </svg>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_bridge.png b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_bridge.png
new file mode 100644
index 0000000..97492ca
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_bridge.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_bridge.svg
index 6aafc23..2890881 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_bridge.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,9 +13,9 @@
    width="1118.8589"
    height="430.20746"
    viewBox="0 0 1118.8589 430.20746"
-   sodipodi:docname="uc_clavister_bridge_new.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_clavister_bridge_new.png"
+   sodipodi:docname="uc_clavister_bridge.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_clavister_bridge.png"
    inkscape:export-xdpi="51.48"
    inkscape:export-ydpi="51.48">
   <metadata
@@ -28,7 +26,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -414,17 +412,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="0.62"
-     inkscape:cx="570.58298"
-     inkscape:cy="298.20108"
+     inkscape:zoom="2.48"
+     inkscape:cx="584.97142"
+     inkscape:cy="325.32512"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layer5"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
@@ -432,7 +430,8 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <g
      inkscape:groupmode="layer"
      id="layer13"
@@ -459,44 +458,41 @@
          id="text4338-8"
          y="284.13779"
          x="-0.59244788"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4)"
          xml:space="preserve"><tspan
            id="tspan4344-6"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="284.13779"
            x="-0.59244788"
            sodipodi:role="line">Legend: </tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="320.57343"
            x="-0.59244788"
            sodipodi:role="line"
            id="tspan1311"><tspan
-   id="tspan1469"
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994">- Connection via cloud/internet:</tspan></tspan><tspan
+             id="tspan1469"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1">- Connection via cloud/internet:</tspan></tspan><tspan
            id="tspan1497"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="359.39594"
            x="-0.59244788"
            sodipodi:role="line">-<tspan
    id="tspan1499"
-   style="font-size:29.14851379px"> VPN/Back to Back (BTB):</tspan></tspan><tspan
+   style="font-size:29.1485px"> VPN/Back to Back (BTB):</tspan></tspan><tspan
            id="tspan1514"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="399.14392"
            x="-0.59244788"
            sodipodi:role="line">- Flow rules:</tspan><tspan
            id="tspan4651-8"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="427.06345"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4340-3"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="450.39679"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4342-1"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="473.7301"
            x="-0.59244788"
            sodipodi:role="line" /></text>
@@ -518,10 +514,7 @@
        y="389.75635"
        x="987.85223"
        id="image1509"
-       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAACCAYAAACg5gd8AAAABHNCSVQICAgIfAhkiAAAAC5JREFU
-CJlj/CIo+P//jx8MDN+/M9AT8DQ0CLOwhIUVE6Wamfk/k4jIFyra/wkAZPAMTyDetBwAAAAASUVO
-RK5CYII=
-"
+       xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB8AAAACCAYAAACg5gd8AAAABHNCSVQICAgIfAhkiAAAAC5JREFU CJlj/CIo+P//jx8MDN+/M9AT8DQ0CLOwhIUVE6Wamfk/k4jIFyra/wkAZPAMTyDetBwAAAAASUVO RK5CYII= "
        preserveAspectRatio="none"
        height="2"
        width="30.799999" />
@@ -534,29 +527,32 @@ RK5CYII=
      style="display:inline"
      sodipodi:insensitive="true">
     <path
-       style="fill:#ff1515;fill-opacity:1;stroke:#d26868;stroke-width:1.23500001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#ff1515;fill-opacity:1;stroke:#d26868;stroke-width:1.235;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 444.5424,89.232813 h 76.42476"
        id="path11527"
        inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.84495008;stroke-opacity:1"
-       id="rect5992-5"
-       width="221.36246"
-       height="63.53022"
-       x="375.70361"
-       y="353.04373"
-       rx="24.146883" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
-       x="485.46494"
-       y="391.01978"
-       id="text5996-5"><tspan
-         sodipodi:role="line"
-         x="485.46494"
-         y="391.01978"
-         style="font-size:24px;stroke-width:0.99999994"
-         id="tspan5998-2">uCPE Manager</tspan></text>
+    <g
+       id="g156">
+      <rect
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.969371;stroke-opacity:1"
+         id="rect5992-5"
+         width="291.35449"
+         height="63.53022"
+         x="340.70761"
+         y="353.04373"
+         rx="31.781824" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
+         x="485.43564"
+         y="390.87329"
+         id="text5996-5"><tspan
+           sodipodi:role="line"
+           x="488.76962"
+           y="390.87329"
+           style="font-size:24px;stroke-width:1"
+           id="tspan5998-2">Enea Edge Management </tspan></text>
+    </g>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 1.5, 0.75, 1.5;stroke-dashoffset:0;stroke-opacity:1"
        d="M 460.37542,254.79742 V 149.42008"
@@ -586,13 +582,13 @@ RK5CYII=
        id="path11692"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.75520343;stroke-opacity:1"
+       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.755203;stroke-opacity:1"
        d="m 491.81875,246.74813 a 38.600327,32.823472 0 0 0 -25.24788,8.04933 27.691538,18.320077 0 0 0 -5.80018,-0.41593 27.691538,18.320077 0 0 0 -23.74662,8.93786 38.447615,26.894051 0 0 0 -3.79253,-0.13266 38.447615,26.894051 0 0 0 -38.4479,26.89421 38.447615,26.894051 0 0 0 10.38596,18.35286 19.300164,12.976722 0 0 0 -0.62115,3.19793 19.300164,12.976722 0 0 0 19.30015,12.97675 19.300164,12.976722 0 0 0 6.7672,-0.83044 17.621889,21.373424 0 0 0 11.69382,5.41047 17.621889,21.373424 0 0 0 9.99262,-3.79733 31.887227,22.900097 0 0 0 22.73375,6.85066 31.887227,22.900097 0 0 0 24.66115,-8.40412 46.991706,19.083413 0 0 0 22.33058,2.29742 46.991706,19.083413 0 0 0 46.9917,-19.0834 46.991706,19.083413 0 0 0 -2.79443,-6.4272 36.370861,21.373424 0 0 0 11.76106,-15.70957 36.370861,21.373424 0 0 0 -36.36972,-21.37342 36.370861,21.373424 0 0 0 -14.98321,1.92624 38.600327,32.823472 0 0 0 -34.81437,-18.71962 z"
        id="path5091-2"
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="485.34775"
        y="297.94391"
        id="text6011-4"><tspan
@@ -600,7 +596,7 @@ RK5CYII=
          id="tspan6009-5"
          x="485.34775"
          y="297.94391"
-         style="font-size:24px;stroke-width:0.99999994">Internet</tspan></text>
+         style="font-size:24px;stroke-width:1">Internet</tspan></text>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -614,11 +610,7 @@ RK5CYII=
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="1111.8201"
        y="185.74878"
-       id="text16006"><tspan
-         sodipodi:role="line"
-         id="tspan16004"
-         x="1111.8201"
-         y="221.1394" /></text>
+       id="text16006" />
     <rect
        style="display:inline;fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:1.45701396;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-6-3"
@@ -661,14 +653,14 @@ RK5CYII=
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="957.31738"
        y="-92.298775"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="957.31738"
          y="-92.298775"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.90288782;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -685,7 +677,7 @@ RK5CYII=
        rx="18.8976" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1096.642"
        y="-37.128029"
        id="text6066-5"><tspan
@@ -693,11 +685,10 @@ RK5CYII=
          id="tspan6064-5"
          x="1096.642"
          y="-37.128029"
-         style="font-size:18.66666603px;stroke-width:0.99999994">Iperf client</tspan><tspan
+         style="font-size:18.6667px;stroke-width:1">Iperf client</tspan><tspan
          sodipodi:role="line"
          x="1096.642"
          y="-14.995701"
-         style="font-size:16px;stroke-width:0.99999994"
          id="tspan5627" /></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.89580917;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -714,14 +705,14 @@ RK5CYII=
        rx="18.8976" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1096.7786"
        y="59.194824"
        id="text6066-5-5"><tspan
          sodipodi:role="line"
          x="1096.7786"
          y="59.194824"
-         style="font-size:18.66666603px;stroke-width:0.99999994"
+         style="font-size:18.6667px;stroke-width:1"
          id="tspan5627-2">Iperf server</tspan></text>
     <path
        style="display:inline;fill:#777777;fill-opacity:1;stroke:#777777;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker7435-0)"
@@ -745,25 +736,25 @@ RK5CYII=
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1096.9641"
        y="-2.1860938"
        id="text6066-5-66"><tspan
          sodipodi:role="line"
          x="1096.9641"
          y="-2.1860938"
-         style="font-size:16px;stroke-width:0.99999994"
+         style="font-size:16px;stroke-width:1"
          id="tspan5627-5">192.168.20.20</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="1097.2831"
        y="95.599319"
        id="text6066-5-5-5"><tspan
          sodipodi:role="line"
          x="1097.2831"
          y="95.599319"
-         style="font-size:16px;stroke-width:0.99999994"
+         style="font-size:16px;stroke-width:1"
          id="tspan5627-2-7">192.168.10.10</tspan></text>
     <g
        style="display:inline"
@@ -784,7 +775,7 @@ RK5CYII=
            transform="scale(-1)" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="-121.59303"
            y="293.63873"
            id="text892-7-6-7"
@@ -793,7 +784,7 @@ RK5CYII=
              id="tspan890-2-5-4"
              x="-121.59303"
              y="293.63873"
-             style="font-size:18.66666603px;writing-mode:lr-tb;stroke-width:0.99999994">bridge</tspan></text>
+             style="font-size:18.6667px;writing-mode:lr-tb;stroke-width:1">bridge</tspan></text>
       </g>
       <text
          id="text252"
@@ -801,7 +792,7 @@ RK5CYII=
          x="667.90558"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="186.91054"
            x="667.90558"
            id="tspan250"
@@ -854,14 +845,14 @@ RK5CYII=
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="169.95915"
        y="5.452795"
        id="text5981-3-7-7"><tspan
          sodipodi:role="line"
          x="169.95915"
          y="5.452795"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5-6">uCPE Device 1</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.90288782;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -903,14 +894,14 @@ RK5CYII=
        rx="22.734337" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="-29.048643"
        y="123.04565"
        id="text6066-5-6"><tspan
          sodipodi:role="line"
          x="-26.644997"
          y="123.04565"
-         style="font-size:17.33333397px;stroke-width:0.99999994"
+         style="font-size:17.3333px;stroke-width:1"
          id="tspan8402">Clavister </tspan></text>
     <text
        xml:space="preserve"
@@ -948,7 +939,7 @@ RK5CYII=
            transform="scale(-1)" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="-121.59303"
            y="293.63873"
            id="text892-7-6"
@@ -957,7 +948,7 @@ RK5CYII=
              id="tspan890-2-5"
              x="-121.59303"
              y="293.63873"
-             style="font-size:18.66666603px;writing-mode:lr-tb;stroke-width:0.99999994">bridge</tspan></text>
+             style="font-size:18.6667px;writing-mode:lr-tb;stroke-width:1">bridge</tspan></text>
       </g>
       <text
          id="text252-9"
@@ -965,7 +956,7 @@ RK5CYII=
          x="273.58078"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="188.12259"
            x="273.58078"
            id="tspan250-1"
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_sriov.png b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_sriov.png
new file mode 100644
index 0000000..2c9ae6b
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_sriov.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_sriov.svg
index 40cbd93..a33c619 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_clavister_sriov.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,10 +13,10 @@
    viewBox="0 0 238.40312 130.74671"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="uc_clavister_sriov_new.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="uc_clavister_sriov.svg"
    style="enable-background:new"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_clavister_sriov_new.png"
+   inkscape:export-filename="E:\PortableApps\WinSCPPortable\App\winscp\scp54837\nfs\hosts\sestonas06\homes\mrpa\docu_work\NFV-Access\branches\feature_USERDOCAP-636\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\uc_clavister_sriov.png"
    inkscape:export-xdpi="63.925339"
    inkscape:export-ydpi="63.925339">
   <defs
@@ -531,15 +529,15 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.81225243"
-     inkscape:cx="514.32224"
-     inkscape:cy="255.43341"
+     inkscape:zoom="1.1486984"
+     inkscape:cx="488.71255"
+     inkscape:cy="196.7697"
      inkscape:document-units="mm"
-     inkscape:current-layer="layer10"
+     inkscape:current-layer="layer12"
      showgrid="false"
      inkscape:showpageshadow="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -551,7 +549,8 @@
      showborder="false"
      width="300mm"
      showguides="true"
-     inkscape:guide-bbox="true">
+     inkscape:guide-bbox="true"
+     inkscape:document-rotation="0">
     <sodipodi:guide
        position="234.31314,62.223912"
        orientation="1,0"
@@ -586,7 +585,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -607,7 +606,8 @@
            height="71.385147"
            x="73.126244"
            y="-106.76833" /></flowRegion><flowPara
-         id="flowPara1101" /></flowRoot>    <flowRoot
+         id="flowPara1101" /></flowRoot>
+    <flowRoot
        transform="translate(45.709914,33.087017)"
        xml:space="preserve"
        id="flowRoot1107"
@@ -618,17 +618,13 @@
            height="156.6991"
            x="128.84148"
            y="-61.499702" /></flowRegion><flowPara
-         id="flowPara1113" /></flowRoot>    <text
+         id="flowPara1113" /></flowRoot>
+    <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="63.141701"
        y="70.058487"
-       id="text6115"><tspan
-         sodipodi:role="line"
-         id="tspan6113"
-         x="63.141701"
-         y="79.422256"
-         style="stroke-width:0.26458332" /></text>
+       id="text6115" />
     <g
        id="g2241"
        transform="translate(-15.799047,-41.898826)">
@@ -648,7 +644,7 @@
          style="display:inline">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332-4-5)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332-4-5)"
            x="-0.59244788"
            y="284.13779"
            id="text4338-8"
@@ -656,41 +652,38 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344-6">Legend: </tspan><tspan
              id="tspan1311"
              sodipodi:role="line"
              x="-0.59244788"
              y="320.57343"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"><tspan
-               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"><tspan
+               style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
                id="tspan1469">- Connection via cloud/internet:</tspan></tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="359.39594"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan1497">-<tspan
-   style="font-size:29.14851379px"
+   style="font-size:29.1485px"
    id="tspan1499"> VPN/Back to Back (BTB):</tspan></tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="399.14392"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan1514">- Flow rules:</tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="427.06345"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4651-8" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="450.39679"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340-3" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="473.7301"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342-1" /></text>
       </g>
       <g
@@ -734,18 +727,18 @@
          id="text1462"
          y="98.868729"
          x="111.07041"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="98.868729"
            x="111.07041"
            id="tspan1460"
            sodipodi:role="line">Internet</tspan></text>
     </g>
     <g
-       id="g1346">
+       id="g216">
       <g
-         transform="translate(87.515383,68.184073)"
+         transform="matrix(0.80350883,0,0,1,91.871977,68.184073)"
          id="g6108">
         <g
            id="g2625">
@@ -756,42 +749,32 @@
              height="24.0366"
              width="55.009563"
              id="rect5992"
-             style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1" />
+             style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1" />
         </g>
         <text
            id="text15008"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006"
-             sodipodi:role="line" /><tspan
-             id="tspan15010"
-             style="stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          transform="scale(0.94922996,1.0534855)"
          id="text6054-2-0-3"
-         y="120.37572"
-         x="129.69933"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.43264198px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.16977006"
+         y="120.33696"
+         x="126.71664"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.43264px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.16977"
          xml:space="preserve"><tspan
-           id="tspan1118-7-2-0"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977006"
-           y="120.37572"
-           x="129.69933"
-           sodipodi:role="line">uCPE</tspan><tspan
            id="tspan6174-7"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977006"
-           y="128.3132"
-           x="129.69933"
-           sodipodi:role="line"> Manager</tspan></text>
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977"
+           y="120.33696"
+           x="126.71664"
+           sodipodi:role="line">Enea Edge </tspan><tspan
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.16977"
+           y="128.27446"
+           x="127.59875"
+           sodipodi:role="line"
+           id="tspan207">Management </tspan></text>
     </g>
     <path
        transform="translate(0,-77.881364)"
@@ -858,7 +841,7 @@
        rx="10.417009" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;enable-background:new"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
        x="171.21869"
        y="16.540989"
        id="text1105-2"><tspan
@@ -866,7 +849,7 @@
          id="tspan1103-4"
          x="171.21869"
          y="16.540989"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">uCPE Device2</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device2</tspan></text>
     <g
        id="g2338"
        transform="translate(0,-1.5875)">
@@ -917,25 +900,25 @@
        rx="4.99999" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.77724"
        y="58.461411"
        id="text6066-5-5"><tspan
          sodipodi:role="line"
          x="206.77724"
          y="58.461411"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.264583"
          id="tspan5627-2">Iperf server</tspan></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.91074"
        y="68.09343"
        id="text6066-5-5-5"><tspan
          sodipodi:role="line"
          x="206.91074"
          y="68.09343"
-         style="font-size:4.23333311px;stroke-width:0.26458332"
+         style="font-size:4.23333px;stroke-width:0.264583"
          id="tspan5627-2-7">192.168.10.10</tspan></text>
     <g
        id="g1222"
@@ -973,7 +956,7 @@
        transform="scale(-1,1)" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:11.06507587px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.27662691;enable-background:new"
+       style="font-style:normal;font-weight:normal;font-size:11.0651px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.276627;enable-background:new"
        x="144.95157"
        y="71.632065"
        id="text4883-3-7-0"
@@ -983,7 +966,7 @@
          id="tspan4881-7-2-8"
          x="144.95157"
          y="71.632065"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.27662691">SR-IOV</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.276627">SR-IOV</tspan></text>
     <rect
        style="display:inline;fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:0.26458332;stroke-opacity:1"
        id="rect6062-5-1"
@@ -994,7 +977,7 @@
        rx="4.99999" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.82547"
        y="33.928337"
        id="text6066-5-7"><tspan
@@ -1002,22 +985,21 @@
          id="tspan6064-5-1"
          x="206.82547"
          y="33.928337"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332">Iperf client</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.264583">Iperf client</tspan><tspan
          sodipodi:role="line"
          x="206.82547"
          y="39.784184"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332"
          id="tspan5627-1" /></text>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611107px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.58611px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="206.91074"
        y="43.173389"
        id="text6066-5-66-0"><tspan
          sodipodi:role="line"
          x="206.91074"
          y="43.173389"
-         style="font-size:4.23333311px;stroke-width:0.26458332"
+         style="font-size:4.23333px;stroke-width:0.264583"
          id="tspan5627-5-9">192.168.20.20</tspan></text>
   </g>
   <g
@@ -1036,7 +1018,7 @@
        rx="10.845516" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="33.868488"
        y="15.210441"
        id="text1105"><tspan
@@ -1044,7 +1026,7 @@
          id="tspan1103"
          x="33.868488"
          y="15.210441"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">uCPE Device1</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">uCPE Device1</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:0.480912;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="M 62.395761,39.457166 H 94.337973"
@@ -1057,7 +1039,7 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:11.06507587px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none"
+       style="font-style:normal;font-weight:normal;font-size:11.0651px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none"
        x="85.768204"
        y="71.705055"
        id="text4883-3-7"
@@ -1067,7 +1049,7 @@
          id="tspan4881-7-2"
          x="85.768204"
          y="71.705055"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none">SR-IOV</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none">SR-IOV</tspan></text>
     <g
        style="stroke-width:0.37;stroke-miterlimit:4;stroke-dasharray:none"
        id="g1209"
@@ -1138,10 +1120,10 @@
          id="text6066-5-6"
          y="123.04565"
          x="-29.048643"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
            id="tspan8402"
-           style="font-size:17.33333397px;stroke-width:0.99999994"
+           style="font-size:17.3333px;stroke-width:1"
            y="123.04565"
            x="-26.644997"
            sodipodi:role="line">Clavister </tspan></text>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_enea_test_vnf.png b/doc/book-enea-edge-example-usecases/doc/images/uc_enea_test_vnf.png
new file mode 100644
index 0000000..be97bc0
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_enea_test_vnf.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_enea_test_vnf.svg
index 8e692f2..fc71729 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_enea_test_vnf.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -15,9 +13,9 @@
    viewBox="0 0 221.39921 112.481"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
    sodipodi:docname="uc_enea_test_vnf.svg"
-   inkscape:export-filename="X:\images\uc_enea_test_vnf.png"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_enea_test_vnf.png"
    inkscape:export-xdpi="65.025185"
    inkscape:export-ydpi="65.025185"
    style="enable-background:new">
@@ -513,25 +511,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.0610016"
-     inkscape:cx="543.91141"
-     inkscape:cy="26.216313"
+     inkscape:zoom="1.2316035"
+     inkscape:cx="337.42354"
+     inkscape:cy="213.58292"
      inkscape:document-units="mm"
-     inkscape:current-layer="svg8"
+     inkscape:current-layer="layer2"
      showgrid="false"
      inkscape:showpageshadow="false"
      showborder="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1858"
-     inkscape:window-height="1177"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
-     fit-margin-bottom="0" />
+     fit-margin-bottom="0"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -575,9 +574,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -591,27 +590,29 @@
      style="display:inline"
      transform="translate(43.000002,-286.11663)">
     <g
-       id="g11688"
-       transform="matrix(0.26458333,0,0,0.26458333,-88.315532,289.3279)">
+       id="g158"
+       inkscape:export-filename="E:\PortableApps\WinSCPPortable\App\winscp\scp57962\nfs\hosts\sestonas06\homes\mrpa\docu_work\NFV-Access\branches\feature_USERDOCAP-636\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\uc_enea_test_vnf.png"
+       inkscape:export-xdpi="65"
+       inkscape:export-ydpi="65">
       <rect
-         rx="23.192089"
-         y="349.04373"
-         x="368.70782"
-         height="63.53022"
-         width="212.60954"
+         rx="7.4362011"
+         y="381.67905"
+         x="3.2798252"
+         height="16.809036"
+         width="68.170113"
          id="rect5992-5"
-         style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.82807648;stroke-opacity:1" />
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.241189;stroke-opacity:1" />
       <text
          id="text5996-5"
-         y="386.32968"
-         x="474.19489"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         y="391.50983"
+         x="37.162312"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
            id="tspan5998-2"
-           style="font-size:21.33333397px;stroke-width:0.99999994"
-           y="386.32968"
-           x="474.19489"
-           sodipodi:role="line">uCPE Manager</tspan></text>
+           style="font-size:5.64444px;stroke-width:0.264583"
+           y="391.50983"
+           x="37.162312"
+           sodipodi:role="line">Enea Edge Management</tspan></text>
     </g>
     <g
        transform="matrix(0.26458333,0,0,0.26458333,-91.32444,288.26957)"
@@ -657,9 +658,9 @@
          id="text6011-4"
          y="367.05307"
          x="37.059994"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05555534px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:7.05555534px;stroke-width:0.26458332"
+           style="font-size:7.05556px;stroke-width:0.264583"
            y="367.05307"
            x="37.059994"
            id="tspan6009-5"
@@ -672,7 +673,7 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="36.357403"
        y="311.03873"
        id="text11531"><tspan
@@ -680,7 +681,7 @@
          id="tspan11529"
          x="36.357403"
          y="311.03873"
-         style="stroke-width:0.26458332">BTB</tspan></text>
+         style="stroke-width:0.264583">BTB</tspan></text>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -698,14 +699,14 @@
        rx="5.6691012" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="-8.9502325"
        y="289.71228"
        id="text5981-3-7-7"><tspan
          sodipodi:role="line"
          x="-8.9502325"
          y="289.71228"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
          id="tspan5983-4-5-6">uCPE Device 1</tspan></text>
     <g
        id="g9810-0"
@@ -744,10 +745,10 @@
          id="text6066-5-6"
          y="320.267"
          x="-14.748354"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888903px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
            id="tspan5627-4"
-           style="font-size:4.93888903px;stroke-width:0.26458332"
+           style="font-size:4.93889px;stroke-width:0.264583"
            y="320.267"
            x="-14.748354"
            sodipodi:role="line">pktgen_dpdk</tspan></text>
@@ -809,14 +810,14 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="113.53959"
        y="290.06937"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="113.53959"
          y="290.06937"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.264583"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
     <g
        id="g2590"
@@ -833,10 +834,10 @@
          id="text6066-5-5"
          y="334.9874"
          x="150.85605"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
            id="tspan5627-2"
-           style="font-size:5.64444447px;stroke-width:0.26458332"
+           style="font-size:5.64444px;stroke-width:0.264583"
            y="334.9874"
            x="150.85605"
            sodipodi:role="line">testpmd_fwd</tspan></text>
@@ -851,14 +852,14 @@
        rx="4.99999" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="150.75102"
        y="309.03262"
        id="text6066-5-5-5"><tspan
          sodipodi:role="line"
          x="150.75102"
          y="309.03262"
-         style="font-size:5.64444447px;stroke-width:0.26458332"
+         style="font-size:5.64444px;stroke-width:0.264583"
          id="tspan5627-2-6">testpmd_term</tspan></text>
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.47971678;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
@@ -911,9 +912,9 @@
          id="text892-7"
          y="-87.169403"
          x="320.57385"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:4.93888855px;writing-mode:lr-tb;stroke-width:0.26458332"
+           style="font-size:4.93889px;writing-mode:lr-tb;stroke-width:0.264583"
            y="-87.169403"
            x="320.57385"
            id="tspan890-2"
@@ -922,9 +923,9 @@
          id="text148"
          y="343.02264"
          x="84.63942"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="343.02264"
            x="84.63942"
            id="tspan146"
@@ -966,35 +967,33 @@
          id="text4338"
          y="284.13779"
          x="-0.59244788"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
          xml:space="preserve"><tspan
            id="tspan4344"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="284.13779"
            x="-0.59244788"
            sodipodi:role="line">Legend: </tspan><tspan
            id="tspan4348"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="320.57343"
            x="-0.59244788"
            sodipodi:role="line">- Connection via cloud/internet:</tspan><tspan
            id="tspan4350"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="357.00906"
            x="-0.59244788"
            sodipodi:role="line">- Back to Back: BTB</tspan><tspan
            id="tspan4651"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="393.4447"
            x="-0.59244788"
            sodipodi:role="line">- Flow rules: </tspan><tspan
            id="tspan4340"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="420.43878"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4342"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
            y="443.77213"
            x="-0.59244788"
            sodipodi:role="line" /></text>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_fw.png b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_fw.png
new file mode 100644
index 0000000..f8ae39a
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_fw.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_fw.svg
index 191ec5e..160c8b0 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_fw.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -14,10 +12,10 @@
    viewBox="0 0 210.00378 81.219772"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="uc_fortigate_fw_new.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   sodipodi:docname="uc_fortigate_fw.svg"
    style="enable-background:new"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_fortigate_fw_new.png"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_fortigate_fw.png"
    inkscape:export-xdpi="62.189999"
    inkscape:export-ydpi="62.189999">
   <defs
@@ -430,15 +428,15 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.81640387"
-     inkscape:cx="400.67601"
-     inkscape:cy="137.53467"
+     inkscape:zoom="1.1545694"
+     inkscape:cx="415.37929"
+     inkscape:cy="192.98518"
      inkscape:document-units="mm"
      inkscape:current-layer="layer12"
      showgrid="false"
      inkscape:showpageshadow="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -451,7 +449,8 @@
      width="300mm"
      inkscape:snap-global="false"
      showguides="true"
-     inkscape:guide-bbox="true" />
+     inkscape:guide-bbox="true"
+     inkscape:document-rotation="0" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -460,7 +459,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -491,26 +490,16 @@
            id="text15008-4"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006-8"
-             sodipodi:role="line" /><tspan
-             id="tspan15010-2"
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          id="text4180"
          y="45.066971"
          x="6.3358655"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="45.066971"
            x="6.3358655"
            id="tspan4178"
@@ -525,11 +514,11 @@
      transform="translate(-24.600193,-22.751582)"
      sodipodi:insensitive="true">
     <flowRoot
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444447px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:tb-rl;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:5.64444px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:tb-rl;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        id="flowRoot4207"
        xml:space="preserve"><flowRegion
          id="flowRegion4209"
-         style="stroke-width:0.26458332"><rect
+         style="stroke-width:0.264583"><rect
            y="45.600235"
            x="114.33484"
            height="6.1890655"
@@ -537,7 +526,8 @@
            id="rect4211"
            style="stroke-width:0.07000434" /></flowRegion><flowPara
          id="flowPara4213"
-         style="stroke-width:0.26458332" /></flowRoot>    <rect
+         style="stroke-width:0.264583" /></flowRoot>
+    <rect
        style="fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.31052992;stroke-opacity:1"
        id="rect5977"
        width="97.136261"
@@ -548,15 +538,10 @@
        ry="9.8702631" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:vertical-lr;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="63.08812"
        y="89.025627"
-       id="text1502"><tspan
-         sodipodi:role="line"
-         id="tspan1500"
-         x="89.025627"
-         y="67.05687"
-         style="stroke-width:0.26458332"></tspan></text>
+       id="text1502" />
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:0.3192617;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 140.76137,41.619283 33.63394,0.0069"
@@ -568,9 +553,9 @@
          id="text265-1"
          y="49.513149"
          x="150.1429"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="49.513149"
            x="150.1429"
            id="tspan263-9"
@@ -589,7 +574,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="654.4104"
            y="150.88129"
            id="text892-7-8-9"><tspan
@@ -597,7 +582,7 @@
              id="tspan890-2-1-9"
              x="654.4104"
              y="150.88129"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">wan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br</tspan></text>
       </g>
     </g>
     <path
@@ -612,9 +597,9 @@
          id="text265"
          y="96.958344"
          x="55.008671"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="96.958344"
            x="55.008671"
            id="tspan263"
@@ -633,7 +618,7 @@
            ry="2.5839915" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
            x="62.570286"
            y="88.203476"
            id="text892-7-06-88"><tspan
@@ -641,7 +626,7 @@
              id="tspan890-2-0-9"
              x="62.570286"
              y="88.203476"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332">lan1_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583">lan1_br</tspan></text>
       </g>
     </g>
     <path
@@ -656,9 +641,9 @@
          id="text265-3"
          y="96.955482"
          x="75.671005"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;enable-background:new"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222223px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.82222px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583"
            y="96.955482"
            x="75.671005"
            id="tspan263-5"
@@ -676,7 +661,7 @@
            ry="2.5839915" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332;enable-background:new"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583;enable-background:new"
            x="85.373268"
            y="89.924515"
            id="text892-7-06-88-2"><tspan
@@ -684,7 +669,7 @@
              id="tspan890-2-0-9-9"
              x="85.373268"
              y="89.924515"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333311px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332">lan2_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.23333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583">lan2_br</tspan></text>
       </g>
     </g>
     <rect
@@ -697,7 +682,7 @@
        rx="3.6602547" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="127.82442"
        y="50.472015"
        id="text1458-5"><tspan
@@ -705,7 +690,7 @@
          x="127.82442"
          y="50.472015"
          id="tspan1460-5"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.26458332">Fortigate</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;stroke-width:0.264583">Fortigate</tspan></text>
     <rect
        style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24650952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
        id="rect5977-9-8-71-3-5"
@@ -726,14 +711,14 @@
        transform="scale(1,-1)" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93888855px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="127.12518"
        y="25.319901"
        id="text5981-3-7-2"><tspan
          sodipodi:role="line"
          x="127.12518"
          y="25.319901"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52778px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.264583"
          id="tspan5983-4-5-0">uCPE Device</tspan></text>
   </g>
   <g
@@ -754,7 +739,8 @@
            height="71.385147"
            x="73.126244"
            y="-106.76833" /></flowRegion><flowPara
-         id="flowPara1101" /></flowRoot>    <flowRoot
+         id="flowPara1101" /></flowRoot>
+    <flowRoot
        transform="translate(45.709914,33.087017)"
        xml:space="preserve"
        id="flowRoot1107"
@@ -765,17 +751,13 @@
            height="156.6991"
            x="128.84148"
            y="-61.499702" /></flowRegion><flowPara
-         id="flowPara1113" /></flowRoot>    <text
+         id="flowPara1113" /></flowRoot>
+    <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="63.141701"
        y="70.058487"
-       id="text6115"><tspan
-         sodipodi:role="line"
-         id="tspan6113"
-         x="63.141701"
-         y="79.422256"
-         style="stroke-width:0.26458332" /></text>
+       id="text6115" />
     <g
        id="g1482"
        transform="translate(-10.990187,-5.5412151)">
@@ -785,7 +767,7 @@
          style="display:inline">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -793,29 +775,26 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              id="tspan1311"
              sodipodi:role="line"
              x="-0.59244788"
              y="322.9603"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"><tspan
-   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"><tspan
+   style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
    id="tspan1469">- Connection via cloud/internet:</tspan> </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="350.87982"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4651" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="374.21317"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="397.54651"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342" /></text>
       </g>
       <g
@@ -851,10 +830,11 @@
            height="43.090054"
            x="27.085176"
            y="256.68076" /></flowRegion><flowPara
-         id="flowPara4176">Test</flowPara></flowRoot>    <flowRoot
+         id="flowPara4176">Test</flowPara></flowRoot>
+    <flowRoot
        xml:space="preserve"
        id="flowRoot4685"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
        transform="scale(0.26458333)"><flowRegion
          id="flowRegion4687"><rect
            id="rect4689"
@@ -862,27 +842,19 @@
            height="36.934334"
            x="790.39471"
            y="328.7027" /></flowRegion><flowPara
-         id="flowPara4691" /></flowRoot>    <path
-       style="display:inline;opacity:1;fill:none;stroke:#000000;stroke-width:0.36356106;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.72712207, 0.36356105, 0.18178051, 0.36356105;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+         id="flowPara4691" /></flowRoot>
+    <path
+       style="display:inline;opacity:1;fill:none;stroke:#000000;stroke-width:0.363561;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.727122, 0.363561, 0.181781, 0.363561;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
        d="M 210.06435,61.711725 V 79.966961"
        id="path8471-8"
        inkscape:connector-curvature="0" />
-    <rect
-       ry="4.2375026"
-       style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.21806791;stroke-opacity:1"
-       id="rect5992-9-0"
-       width="39.340992"
-       height="23.810053"
-       x="190.41014"
-       y="80.052269"
-       rx="4.2914338" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:0.33103764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.66207523, 0.33103761, 0.16551882, 0.33103761;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.331038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.662075, 0.331038, 0.165519, 0.331038;stroke-dashoffset:0;stroke-opacity:1"
        d="m 196.32243,57.524306 h -19.398"
        id="path8471-3-0-3-8"
        inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24650952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24651;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5977-9-8-71-3"
        width="2.9787803"
        height="6.1577935"
@@ -891,12 +863,12 @@
        rx="0.32715935"
        transform="scale(1,-1)" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:0.33103764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.66207523, 0.33103761, 0.16551882, 0.33103761;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:0.331038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.662075, 0.331038, 0.165519, 0.331038;stroke-dashoffset:0;stroke-opacity:1"
        d="m 196.26268,41.636225 h -19.398"
        id="path8471-3-0-3-8-9"
        inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24650952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.24651;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5977-9-8-71-3-9"
        width="2.9787803"
        height="6.1577935"
@@ -905,13 +877,13 @@
        rx="0.32715935"
        transform="scale(1,-1)" />
     <path
-       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.25427502;stroke-opacity:1"
+       style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.254275;stroke-opacity:1"
        d="m 211.52785,26.000497 a 10.280439,13.97151 0 0 0 -6.72428,3.426249 7.3750976,7.798052 0 0 0 -1.54476,-0.177046 7.3750976,7.798052 0 0 0 -6.32445,3.804457 10.239768,11.447616 0 0 0 -1.01007,-0.05647 10.239768,11.447616 0 0 0 -10.23984,11.447682 10.239768,11.447616 0 0 0 2.7661,7.812005 5.1402199,5.5236202 0 0 0 -0.16543,1.361221 5.1402199,5.5236202 0 0 0 5.14021,5.523629 5.1402199,5.5236202 0 0 0 1.80232,-0.35348 4.6932442,9.0977274 0 0 0 3.11442,2.302999 4.6932442,9.0977274 0 0 0 2.66133,-1.616355 8.4925367,9.7475653 0 0 0 6.05469,2.916023 8.4925367,9.7475653 0 0 0 6.56801,-3.577265 12.515318,8.1229707 0 0 0 5.94732,0.977913 12.515318,8.1229707 0 0 0 12.51531,-8.122967 12.515318,8.1229707 0 0 0 -0.74424,-2.735776 9.6866648,9.0977274 0 0 0 3.13233,-6.686873 9.6866648,9.0977274 0 0 0 -9.68636,-9.097724 9.6866648,9.0977274 0 0 0 -3.99049,0.819912 10.280439,13.97151 0 0 0 -9.27212,-7.96812 z"
        id="path5091-2-9"
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+       style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
        x="199.03485"
        y="46.431309"
        id="text4180-9-8-7"><tspan
@@ -919,20 +891,50 @@
          id="tspan4178-6-6-2"
          x="199.03485"
          y="46.431309"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.3499999px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.26458332">Internet</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:6.35px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Internet</tspan></text>
     <flowRoot
        xml:space="preserve"
        id="flowRoot2130"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       transform="matrix(0.23662585,0,0,0.23365212,70.806276,-5.7897538)"><flowRegion
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       transform="matrix(0.4543271,0,0,0.23365212,-57.332226,-5.7897538)"><flowRegion
          id="flowRegion2132"><rect
            id="rect2134"
            width="118.79844"
            height="68.571358"
            x="528.01184"
            y="384.12811" /></flowRegion><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584602px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2136">uCPE</flowPara><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584602px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2138">Manager</flowPara></flowRoot>  </g>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.0058px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
+         id="flowPara2138" /></flowRoot>
+    <g
+       id="g188"
+       inkscape:export-filename="E:\PortableApps\WinSCPPortable\App\winscp\scp01954\nfs\hosts\sestonas06\homes\mrpa\docu_work\NFV-Access\branches\feature_USERDOCAP-636\nfv-access-documentation\doc\book-enea-nfv-access-example-usecases\doc\images\uc_fortigate_fw.png"
+       inkscape:export-xdpi="62"
+       inkscape:export-ydpi="62">
+      <rect
+         ry="4.2313652"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.252553;stroke-opacity:1"
+         id="rect5992-9-0"
+         width="52.844162"
+         height="23.775566"
+         x="183.65855"
+         y="80.069511"
+         rx="5.7644005" />
+      <text
+         xml:space="preserve"
+         style="font-style:normal;font-weight:normal;font-size:6.35px;line-height:1.25;font-family:sans-serif;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="209.83569"
+         y="89.745026"
+         id="text160"><tspan
+           sodipodi:role="line"
+           id="tspan158"
+           x="209.83569"
+           y="89.745026"
+           style="font-size:6.35px;text-align:center;text-anchor:middle;stroke-width:0.264583">Enea Edge </tspan><tspan
+           sodipodi:role="line"
+           x="209.83569"
+           y="97.682526"
+           style="font-size:6.35px;text-align:center;text-anchor:middle;stroke-width:0.264583"
+           id="tspan162">Management</tspan></text>
+    </g>
+  </g>
 </svg>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_sdwan.png b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_sdwan.png
new file mode 100644
index 0000000..b71b02e
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_sdwan.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_sdwan.svg
index 4255bf6..3de54dd 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_fortigate_sdwan.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -16,8 +14,8 @@
    height="482.41965"
    viewBox="0 0 830.09292 482.41966"
    sodipodi:docname="uc_fortigate_sdwan.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="L:\docu_work\el_releases-nfv-access\doc\book-enea-nfv-access-example-usecases\doc\images\uc_fortigate_sdwan.png"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_fortigate_sdwan.png"
    inkscape:export-xdpi="65.519997"
    inkscape:export-ydpi="65.519997">
   <metadata
@@ -430,17 +428,17 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="false"
      inkscape:zoom="1.0074671"
-     inkscape:cx="429.30796"
-     inkscape:cy="215.58101"
+     inkscape:cx="419.71809"
+     inkscape:cy="299.93679"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer3"
+     inkscape:current-layer="layer5"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
@@ -448,7 +446,8 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <g
      inkscape:groupmode="layer"
      id="layer1"
@@ -485,7 +484,7 @@
          id="g5968">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:8.46666622px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-weight:normal;font-size:8.46667px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
            x="18.006182"
            y="21.814686"
            id="text5964"><tspan
@@ -493,7 +492,7 @@
              id="tspan5962"
              x="18.006182"
              y="21.814686"
-             style="font-size:8.46666622px;stroke-width:0.26458332">Cloud</tspan></text>
+             style="font-size:8.46667px;stroke-width:0.264583">Cloud</tspan></text>
       </g>
     </g>
     <rect
@@ -507,7 +506,7 @@
        ry="22.677166" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="876.67236"
        y="570.11469"
        id="text5981"><tspan
@@ -515,11 +514,11 @@
          id="tspan5979"
          x="876.67236"
          y="570.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994">uCPE</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1">uCPE</tspan><tspan
          sodipodi:role="line"
          x="876.67236"
          y="610.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983">Device</tspan></text>
     <g
        transform="matrix(3.7795276,0,0,3.7795276,428.74031,418.42027)"
@@ -538,15 +537,15 @@
          id="text5996"
          y="62.470726"
          x="35.614925"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="62.470726"
            x="35.614925"
            id="tspan5994"
            sodipodi:role="line">uCPE</tspan><tspan
            id="tspan5998"
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="73.054062"
            x="35.614925"
            sodipodi:role="line">Manager</tspan></text>
@@ -568,9 +567,9 @@
          id="text6011"
          y="111.3953"
          x="104.96505"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="111.3953"
            x="104.96505"
            id="tspan6009"
@@ -593,9 +592,9 @@
          id="text6054"
          y="36.242371"
          x="174.40106"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="36.242371"
            x="174.40106"
            id="tspan6052"
@@ -618,9 +617,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -644,9 +643,9 @@
          id="text892"
          y="-24.028263"
          x="158.336"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+           style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
            y="-24.028263"
            x="158.336"
            id="tspan890"
@@ -718,53 +717,45 @@
      id="layer5"
      inkscape:label="btb, internet, ucpe manager"
      transform="translate(-23.865391,-45.497822)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3060993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.6121985, 1.30609926, 0.65304962, 1.30609926;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.6122, 1.3061, 0.65305, 1.3061;stroke-dashoffset:0;stroke-opacity:1"
        d="m 492.68784,161.04591 v 79.89453"
        id="path8471-3-0-5-4-7-6-3"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.29300523;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.58601049, 1.29300525, 0.64650262, 1.29300525;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.29301;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.58601, 1.29301, 0.646503, 1.29301;stroke-dashoffset:0;stroke-opacity:1"
        d="M 440.34086,288.13958 V 209.83895"
        id="path8471-3-0"
        inkscape:connector-curvature="0" />
-    <rect
-       ry="16.015759"
-       style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.82419372;stroke-opacity:1"
-       id="rect5992-9"
-       width="148.69037"
-       height="89.990753"
-       x="365.99567"
-       y="288.93851"
-       rx="16.219593" />
     <path
-       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.2484287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.24843;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 569.66925,124.00658 -51.10954,0.012"
        id="path8471-3-2-5-5-4-6-9-8"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3063972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279433, 1.30639717, 0.65319858, 1.30639717;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3064;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279, 1.3064, 0.653199, 1.3064;stroke-dashoffset:0;stroke-opacity:1"
        d="m 389.31534,159.12973 v 79.93098"
        id="path8471-3-0-5-4-7-6-3-0"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3063972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279433, 1.30639717, 0.65319858, 1.30639717;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3064;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279, 1.3064, 0.653199, 1.3064;stroke-dashoffset:0;stroke-opacity:1"
        d="M 389.33652,181.0334 H 309.40554"
        id="path8471-3-0-5-2"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3063972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279433, 1.30639717, 0.65319858, 1.30639717;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.3064;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.61279, 1.3064, 0.653199, 1.3064;stroke-dashoffset:0;stroke-opacity:1"
        d="M 568.52125,182.74033 H 488.59028"
        id="path8471-3-0-5-2-4"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.21068478;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.21068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 853.95759,519.79962 -30.03505,0.0338"
        id="path8471-3-2-5-5-4-6-9-7"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.2484287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:1.24843;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 355.88704,123.01486 -51.10954,0.012"
        id="path8471-3-2-5-5-4-6-9-8-8"
        inkscape:connector-curvature="0" />
@@ -774,64 +765,73 @@
          inkscape:connector-curvature="0"
          id="path5091-2"
          d="m 445.81065,75.822009 a 38.855204,52.805708 0 0 0 -25.4146,12.949601 27.874385,29.472953 0 0 0 -5.83847,-0.669151 27.874385,29.472953 0 0 0 -23.90343,14.379051 38.701484,43.266581 0 0 0 -3.81757,-0.21342 38.701484,43.266581 0 0 0 -38.70176,43.26683 38.701484,43.266581 0 0 0 10.45454,29.52569 19.427603,20.876675 0 0 0 -0.62526,5.14477 19.427603,20.876675 0 0 0 19.42759,20.87671 19.427603,20.876675 0 0 0 6.81189,-1.33599 17.738246,34.385112 0 0 0 11.77104,8.70425 17.738246,34.385112 0 0 0 10.05859,-6.10906 32.097777,36.841192 0 0 0 22.88385,11.02119 32.097777,36.841192 0 0 0 24.82399,-13.52037 47.301991,30.700992 0 0 0 22.47804,3.69605 47.301991,30.700992 0 0 0 47.30198,-30.70098 47.301991,30.700992 0 0 0 -2.81288,-10.33994 36.611017,34.385112 0 0 0 11.83871,-25.27322 36.611017,34.385112 0 0 0 -36.60986,-34.3851 36.611017,34.385112 0 0 0 -15.08215,3.09888 38.855204,52.805708 0 0 0 -35.04424,-30.11573 z"
-         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.96103942;stroke-opacity:1" />
+         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.961039;stroke-opacity:1" />
       <text
          id="text4180-9-8-7"
          y="153.04083"
          x="398.5928"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="153.04083"
            x="398.5928"
            id="tspan4178-6-6-2"
            sodipodi:role="line">Internet</tspan></text>
     </g>
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2130"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
-       transform="matrix(0.89433392,0,0,0.88309463,-86.050427,-35.503783)"><flowRegion
-         id="flowRegion2132"><rect
-           id="rect2134"
-           width="118.79844"
-           height="68.571358"
-           x="528.01184"
-           y="384.12811" /></flowRegion><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2136">uCPE</flowPara><flowPara
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
-         id="flowPara2138">Manager</flowPara></flowRoot>  </g>
+    <g
+       id="g247">
+      <rect
+         ry="16.015759"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.886108;stroke-opacity:1"
+         id="rect5992-9"
+         width="171.86906"
+         height="89.990753"
+         x="354.40631"
+         y="288.93851"
+         rx="18.747995" />
+      <flowRoot
+         xml:space="preserve"
+         id="flowRoot2130"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         transform="matrix(1.3924524,0,0,1.3749531,-378.43971,-225.73956)"><flowRegion
+           id="flowRegion2132"><rect
+             id="rect2134"
+             width="118.79844"
+             height="68.571358"
+             x="528.01184"
+             y="384.12811"
+             style="stroke-width:1;" /></flowRegion><flowPara
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle"
+           id="flowPara2138">Enea Edge Management</flowPara></flowRoot>
+    </g>
+  </g>
   <g
      inkscape:groupmode="layer"
      id="layer3"
      inkscape:label="uCPE Device 2"
      transform="translate(-206.89353,53.60331)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="1111.8201"
        y="185.74878"
-       id="text16006"><tspan
-         sodipodi:role="line"
-         id="tspan16004"
-         x="1111.8201"
-         y="221.1394" /></text>
+       id="text16006" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="895.67767"
        y="-42.627693"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="895.67767"
          y="-42.627693"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
     <rect
        transform="scale(-1,1)"
-       style="display:inline;fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:1.34585321;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;fill:#ffffff;fill-opacity:0.641414;stroke:#000000;stroke-width:1.34585;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-6-3-4-3"
        width="281.12839"
        height="239.35895"
@@ -840,12 +840,12 @@
        rx="30.934816"
        ry="30.030743" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23700833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23701;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 947.78223,253.10428 -0.023,-146.22781"
        id="path8471-3-2-5-5-29-0"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 886.95565,83.624017 -123.61367,0.03037"
        id="path8471-3-2-5-5-2-3"
        inkscape:connector-curvature="0" />
@@ -878,7 +878,7 @@
          ry="1.8328245" />
     </g>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529097;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058213, 1.27529107, 0.63764553, 1.27529107;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058, 1.27529, 0.637646, 1.27529;stroke-dashoffset:0;stroke-opacity:1"
        d="M 751.77066,141.52555 H 675.71628"
        id="path8471-3-0-5-7"
        inkscape:connector-curvature="0" />
@@ -917,7 +917,7 @@
          id="g1507">
         <rect
            ry="9.5910397"
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.45560217;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.455602;stroke-opacity:1"
            id="rect6098-9-0-0"
            width="99.182129"
            height="40.239689"
@@ -927,7 +927,7 @@
            transform="scale(-1,1)" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="825.0979"
            y="85.985962"
            id="text892-7-06-8"><tspan
@@ -935,7 +935,7 @@
              id="tspan890-2-0-4"
              x="825.0979"
              y="85.985962"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">vnfmgmt_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">vnfmgmt_br</tspan></text>
       </g>
       <text
          id="text265-7"
@@ -943,7 +943,7 @@
          x="811.77759"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="111.9693"
            x="811.77759"
            id="tspan263-29"
@@ -959,22 +959,22 @@
          height="110.76262"
          width="124.50654"
          id="rect6062-3-1-3"
-         style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172344;stroke-opacity:1"
+         style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172;stroke-opacity:1"
          ry="13.834034" />
       <text
          id="text4180-9-8"
          y="56.970852"
          x="900.65613"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="56.970852"
            x="900.65613"
            id="tspan4178-6-6"
            sodipodi:role="line">Fortigate</tspan></text>
     </g>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 886.77714,25.395776 -123.61367,0.03037"
        id="path8471-3-2-5-5-2-3-0"
        inkscape:connector-curvature="0" />
@@ -988,15 +988,15 @@
          height="40.235157"
          width="69.460823"
          id="rect6098-9-0-8-7"
-         style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1"
+         style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.442319;stroke-opacity:1"
          ry="9.5899591" />
       <text
          id="text892-7-06-6"
          y="29.063463"
          x="824.68774"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
            y="29.063463"
            x="824.68774"
            id="tspan890-2-0-48"
@@ -1007,7 +1007,7 @@
          x="811.77759"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="56.039993"
            x="811.77759"
            id="tspan263-0"
@@ -1021,7 +1021,7 @@
          x="912.22858"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="182.38129"
            x="912.22858"
            id="tspan263"
@@ -1031,7 +1031,7 @@
          style="display:inline"
          transform="translate(834.25256,-97.63017)">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.446426;stroke-opacity:1"
            id="rect6098-9-2-8"
            width="69.460823"
            height="40.985825"
@@ -1041,7 +1041,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="112.90489"
            y="253.41431"
            id="text892-7-06-88"><tspan
@@ -1049,7 +1049,7 @@
              id="tspan890-2-0-9"
              x="112.90489"
              y="253.41431"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
       </g>
     </g>
   </g>
@@ -1058,27 +1058,18 @@
      id="layer7"
      inkscape:label="Test Machines"
      style="display:inline"
-     transform="translate(-314.7295,-31.73299)">
+     transform="translate(-314.7295,-31.73299)"
+     sodipodi:insensitive="true">
     <g
        style="fill:#ac9d93"
        id="g6108-0"
        transform="matrix(3.0761692,0,0,3.7814034,-32.512633,-85.890206)">
       <text
          xml:space="preserve"
-         style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
          x="53.59409"
          y="60.119961"
-         id="text15008-4"><tspan
-           sodipodi:role="line"
-           id="tspan15006-8"
-           x="53.59409"
-           y="69.483727"
-           style="fill:#ac9d93;stroke-width:0.26458332" /><tspan
-           sodipodi:role="line"
-           x="53.59409"
-           y="82.712898"
-           style="fill:#ac9d93;stroke-width:0.26458332"
-           id="tspan15010-2" /></text>
+         id="text15008-4" />
     </g>
     <g
        id="g1510"
@@ -1088,7 +1079,7 @@
          id="g6108-0-4"
          style="fill:#ac9d93">
         <rect
-           style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1"
+           style="fill:#ac9d93;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1"
            id="rect5992-4-8"
            width="55.009563"
            height="24.0366"
@@ -1100,26 +1091,16 @@
            id="text15008-4-9"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006-8-0"
-             sodipodi:role="line" /><tspan
-             id="tspan15010-2-6"
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          id="text4180-9"
          y="392.58759"
          x="983.2702"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="392.58759"
            x="983.2702"
            id="tspan4178-6"
@@ -1134,7 +1115,7 @@
          id="g6108-0-4-0"
          style="fill:#ac9d93">
         <rect
-           style="fill:#ac9d93;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.25908634;stroke-opacity:1"
+           style="fill:#ac9d93;fill-opacity:0.641414;stroke:#000000;stroke-width:0.259086;stroke-opacity:1"
            id="rect5992-4-8-1"
            width="55.009563"
            height="24.0366"
@@ -1146,26 +1127,16 @@
            id="text15008-4-9-6"
            y="60.119961"
            x="53.59409"
-           style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.26458332"
-           xml:space="preserve"><tspan
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="69.483727"
-             x="53.59409"
-             id="tspan15006-8-0-6"
-             sodipodi:role="line" /><tspan
-             id="tspan15010-2-6-1"
-             style="fill:#ac9d93;stroke-width:0.26458332"
-             y="82.712898"
-             x="53.59409"
-             sodipodi:role="line" /></text>
+           style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ac9d93;fill-opacity:1;stroke:none;stroke-width:0.264583"
+           xml:space="preserve" />
       </g>
       <text
          id="text4180-9-1"
          y="392.58759"
          x="983.2702"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="392.58759"
            x="983.2702"
            id="tspan4178-6-8"
@@ -1177,9 +1148,10 @@
      id="layer4"
      inkscape:label="uCPE Device 1"
      transform="translate(-23.865391,-45.497822)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <rect
-       style="display:inline;fill:#ffffff;fill-opacity:0.64141415;stroke:#000000;stroke-width:1.37003899;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="display:inline;fill:#ffffff;fill-opacity:0.641414;stroke:#000000;stroke-width:1.37004;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-6-3-4"
        width="281.05768"
        height="238.16554"
@@ -1188,7 +1160,7 @@
        rx="32.21727"
        ry="29.881014" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 298.04539,180.93127 -123.61367,0.0304"
        id="path8471-3-2-5-5-2-3-0-4-8"
        inkscape:connector-curvature="0" />
@@ -1222,23 +1194,23 @@
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="165.88004"
        y="55.204853"
        id="text5981-3-7-7"><tspan
          sodipodi:role="line"
          x="165.88004"
          y="55.204853"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5-6">uCPE Device 1</tspan></text>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.22999537;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 296.7775,123.21848 -123.61367,0.0304"
        id="path8471-3-2-5-5-2-3-0-4"
        inkscape:connector-curvature="0" />
     <rect
        ry="13.834034"
-       style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172344;stroke-opacity:1"
+       style="fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172;stroke-opacity:1"
        id="rect6062-3-1"
        width="124.50654"
        height="110.76262"
@@ -1246,7 +1218,7 @@
        y="94.626221"
        rx="13.834034" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23712945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23713;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 113.52967,352.093 -0.023,-147.02781"
        id="path8471-3-2-5-5-29-0-3"
        inkscape:connector-curvature="0" />
@@ -1270,7 +1242,7 @@
          transform="translate(-3.3059349,7.7197473)"
          id="g1576">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.44231871;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.442319;stroke-opacity:1"
            id="rect6098-9-0-8"
            width="69.460823"
            height="40.235157"
@@ -1280,7 +1252,7 @@
            ry="9.5899591" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="240.43568"
            y="119.65066"
            id="text892-7-8-1"><tspan
@@ -1288,7 +1260,7 @@
              id="tspan890-2-1-5"
              x="240.43568"
              y="119.65066"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">wan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br</tspan></text>
       </g>
       <text
          id="text265-0"
@@ -1296,7 +1268,7 @@
          x="223.73131"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="153.33401"
            x="223.73131"
            id="tspan263-2"
@@ -1307,7 +1279,7 @@
       <g
          id="g1625">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.446426;stroke-opacity:1"
            id="rect6098-9-2"
            width="69.460823"
            height="40.985825"
@@ -1317,7 +1289,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="112.90489"
            y="253.41431"
            id="text892-7-06"><tspan
@@ -1325,7 +1297,7 @@
              id="tspan890-2-0"
              x="112.90489"
              y="253.41431"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
       </g>
       <text
          id="text265-8"
@@ -1333,7 +1305,7 @@
          x="122.01346"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="281.41678"
            x="122.01346"
            id="tspan263-1"
@@ -1344,17 +1316,13 @@
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="227.95877"
        y="622.30133"
-       id="text1355"><tspan
-         sodipodi:role="line"
-         id="tspan1353"
-         x="227.95877"
-         y="657.69196" /></text>
+       id="text1355" />
     <g
        id="g1756">
       <g
          id="g1611">
         <rect
-           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.46265486;stroke-opacity:1"
+           style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.462655;stroke-opacity:1"
            id="rect6098-9-0"
            width="100.74141"
            height="40.235157"
@@ -1364,7 +1332,7 @@
            ry="9.5899591" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="237.05164"
            y="185.0871"
            id="text892-7-8"><tspan
@@ -1372,7 +1340,7 @@
              id="tspan890-2-1"
              x="237.05164"
              y="185.0871"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">vnfmgmt_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">vnfmgmt_br</tspan></text>
       </g>
       <text
          id="text265-3"
@@ -1380,7 +1348,7 @@
          x="223.73131"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="210.3636"
            x="223.73131"
            id="tspan263-06"
@@ -1388,7 +1356,7 @@
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="65.647079"
        y="156.07199"
        id="text4180-9-8-8"><tspan
@@ -1396,9 +1364,9 @@
          id="tspan4178-6-6-9"
          x="65.647079"
          y="156.07199"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994">Fortigate</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1">Fortigate</tspan></text>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529097;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058213, 1.27529107, 0.63764553, 1.27529107;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.27529;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.55058, 1.27529, 0.637646, 1.27529;stroke-dashoffset:0;stroke-opacity:1"
        d="M 388.96711,239.06071 H 312.91273"
        id="path8471-3-0-5-7-8"
        inkscape:connector-curvature="0" />
@@ -1422,7 +1390,8 @@
      id="layer13"
      inkscape:label="Legend"
      transform="translate(-23.865391,-45.497822)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <g
        id="g1353"
        transform="translate(22,-2)">
@@ -1431,38 +1400,35 @@
          id="text4338"
          y="284.13779"
          x="-0.59244788"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
          xml:space="preserve"><tspan
            id="tspan4344"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="284.13779"
            x="-0.59244788"
            sodipodi:role="line">Legend: </tspan><tspan
            id="tspan4348"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="320.57343"
            x="-0.59244788"
            sodipodi:role="line">- Connection via cloud/internet:</tspan><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="359.39594"
            x="-0.59244788"
            sodipodi:role="line"
            id="tspan1311"><tspan
-   style="font-size:29.14851379px"
+   style="font-size:29.1485px"
    id="tspan1379">- VPN/BTB:</tspan> </tspan><tspan
            id="tspan4651"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
-           y="387.31546"
+           y="387.31552"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4340"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
-           y="410.6488"
+           y="410.6489"
            x="-0.59244788"
            sodipodi:role="line" /><tspan
            id="tspan4342"
-           style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
-           y="433.98215"
+           y="433.98227"
            x="-0.59244788"
            sodipodi:role="line" /></text>
     </g>
diff --git a/doc/book-enea-edge-example-usecases/doc/images/uc_vnf_chaining.png b/doc/book-enea-edge-example-usecases/doc/images/uc_vnf_chaining.png
new file mode 100644
index 0000000..6aaf4c0
--- /dev/null
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_vnf_chaining.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg b/doc/book-enea-edge-example-usecases/doc/images/uc_vnf_chaining.svg
index 67e0250..2bb15af 100755
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.svg
+++ b/doc/book-enea-edge-example-usecases/doc/images/uc_vnf_chaining.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -14,9 +12,9 @@
    width="960.42157"
    height="482.07703"
    viewBox="0 0 960.42155 482.07702"
-   sodipodi:docname="uc_vnf_chaining_new.svg"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="E:\Documents\ENEA Work files\ENFV work\ENA 2.2.2\Example Usecase pics\uc_vnf_chaining_new.png"
+   sodipodi:docname="uc_vnf_chaining.svg"
+   inkscape:version="1.0.2 (e86c870, 2021-01-15)"
+   inkscape:export-filename="D:\ENEA Work files\ENFV work\ENA 2.4\AP-636\uc_vnf_chaining.png"
    inkscape:export-xdpi="60.310001"
    inkscape:export-ydpi="60.310001">
   <metadata
@@ -174,13 +172,13 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
      id="namedview4"
      showgrid="false"
-     inkscape:zoom="0.81454783"
-     inkscape:cx="494.65223"
-     inkscape:cy="201.83139"
+     inkscape:zoom="1.1519446"
+     inkscape:cx="460.98794"
+     inkscape:cy="291.07773"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
@@ -192,7 +190,8 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:showpageshadow="false"
-     showborder="false" />
+     showborder="false"
+     inkscape:document-rotation="0" />
   <g
      inkscape:groupmode="layer"
      id="layer2"
@@ -213,7 +212,7 @@
          id="g5968">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-weight:normal;font-size:8.46666622px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+           style="font-style:normal;font-weight:normal;font-size:8.46667px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
            x="18.006182"
            y="21.814686"
            id="text5964"><tspan
@@ -221,7 +220,7 @@
              id="tspan5962"
              x="18.006182"
              y="21.814686"
-             style="font-size:8.46666622px;stroke-width:0.26458332">Cloud</tspan></text>
+             style="font-size:8.46667px;stroke-width:0.264583">Cloud</tspan></text>
       </g>
     </g>
     <rect
@@ -234,7 +233,7 @@
        rx="22.677166" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="876.67236"
        y="570.11469"
        id="text5981"><tspan
@@ -242,11 +241,11 @@
          id="tspan5979"
          x="876.67236"
          y="570.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994">uCPE</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1">uCPE</tspan><tspan
          sodipodi:role="line"
          x="876.67236"
          y="610.11469"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.99999809px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32px;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;text-anchor:middle;stroke-width:1"
          id="tspan5983">Device</tspan></text>
     <g
        transform="matrix(3.7795276,0,0,3.7795276,428.74031,418.42027)"
@@ -264,15 +263,15 @@
          id="text5996"
          y="62.470726"
          x="35.614925"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="62.470726"
            x="35.614925"
            id="tspan5994"
            sodipodi:role="line">uCPE</tspan><tspan
            id="tspan5998"
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="73.054062"
            x="35.614925"
            sodipodi:role="line">Manager</tspan></text>
@@ -293,9 +292,9 @@
          id="text6011"
          y="111.3953"
          x="104.96505"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="stroke-width:0.26458332"
+           style="stroke-width:0.264583"
            y="111.3953"
            x="104.96505"
            id="tspan6009"
@@ -317,9 +316,9 @@
          id="text6054"
          y="36.242371"
          x="174.40106"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="36.242371"
            x="174.40106"
            id="tspan6052"
@@ -341,9 +340,9 @@
          id="text6066"
          y="68.725212"
          x="168.60965"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;stroke-width:0.26458332"
+           style="font-size:8.46667px;stroke-width:0.264583"
            y="68.725212"
            x="168.60965"
            id="tspan6064"
@@ -366,9 +365,9 @@
          id="text892"
          y="-24.028263"
          x="158.336"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46666622px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8.46667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-size:8.46666622px;writing-mode:lr-tb;stroke-width:0.26458332"
+           style="font-size:8.46667px;writing-mode:lr-tb;stroke-width:0.264583"
            y="-24.028263"
            x="158.336"
            id="tspan890"
@@ -452,11 +451,7 @@
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        x="1111.8201"
        y="185.74878"
-       id="text16006"><tspan
-         sodipodi:role="line"
-         id="tspan16004"
-         x="1111.8201"
-         y="221.1394" /></text>
+       id="text16006" />
     <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.19493914;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m 875.06947,109.79183 -0.0401,88.56814"
@@ -490,7 +485,7 @@
        rx="7.8679585" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="765.37158"
        y="157.87267"
        id="text892-7-8-1-0"><tspan
@@ -498,7 +493,7 @@
          id="tspan890-2-1-5-6"
          x="765.37158"
          y="157.87267"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">sfc_br</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">sfc_br</tspan></text>
     <rect
        style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-9-8-71-7"
@@ -537,7 +532,7 @@
            rx="13.834034" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
            x="841.7915"
            y="62.518135"
            id="text1458-5"><tspan
@@ -553,7 +548,7 @@
          x="870.17896"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="109.18118"
            x="870.17896"
            id="tspan7681"
@@ -564,7 +559,7 @@
          x="795.86865"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="109.18118"
            x="795.86865"
            id="tspan7685-0"
@@ -583,7 +578,7 @@
          id="text1454"
          y="405.72467"
          x="688.84973"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            style="font-size:24px"
            y="405.72467"
@@ -601,7 +596,7 @@
          id="tspan263"
          x="839.50726"
          y="184.34474"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">dpdk</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">dpdk</tspan></text>
     <rect
        style="fill:#ffe699;fill-opacity:1;stroke:#000000;stroke-width:0.4464258;stroke-opacity:1"
        id="rect6098-9-2-8"
@@ -613,7 +608,7 @@
        ry="9.7688789" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="874.43616"
        y="157.74759"
        id="text892-7-06-88"><tspan
@@ -621,7 +616,7 @@
          id="tspan890-2-0-9"
          x="874.43616"
          y="157.74759"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
     <rect
        style="display:inline;fill:#a9d18e;fill-opacity:1;stroke:#000000;stroke-width:1.09172344;stroke-opacity:1"
        id="rect6062-3-1-8-6-6"
@@ -632,7 +627,7 @@
        rx="13.834034" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
        x="683.34515"
        y="63.026798"
        id="text1466-1"><tspan
@@ -651,7 +646,7 @@
          id="tspan7681-8"
          x="709.22375"
          y="109.318"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
@@ -662,7 +657,7 @@
          id="tspan7685-0-5"
          x="639.34747"
          y="109.318"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
     <g
        id="g2145">
       <text
@@ -671,7 +666,7 @@
          x="619.76776"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="184.37215"
            x="619.76776"
            id="tspan263-9"
@@ -690,7 +685,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="654.4104"
            y="150.88129"
            id="text892-7-8-9"><tspan
@@ -698,19 +693,19 @@
              id="tspan890-2-1-9"
              x="654.4104"
              y="150.88129"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">wan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">wan_br</tspan></text>
       </g>
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="763.6579"
        y="-35.451283"
        id="text5981-3-7"><tspan
          sodipodi:role="line"
          x="763.6579"
          y="-35.451283"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5">uCPE Device 2</tspan></text>
   </g>
   <g
@@ -727,7 +722,7 @@
        inkscape:connector-curvature="0" />
     <flowRoot
        transform="translate(-199.73182,56.969024)"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
        id="flowRoot1440"
        xml:space="preserve"><flowRegion
          id="flowRegion1442"><rect
@@ -736,7 +731,8 @@
            height="137.12756"
            width="147.02336"
            id="rect1444" /></flowRegion><flowPara
-         id="flowPara1446" /></flowRoot>    <path
+         id="flowPara1446" /></flowRoot>
+    <path
        style="display:inline;fill:none;stroke:#000000;stroke-width:1.19493914;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        d="m -134.46807,208.19818 -0.0401,88.56814"
        id="path8471-3-2-5-5-29-4-8-2-9-4-1"
@@ -774,7 +770,7 @@
        rx="7.8679585" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="-24.426455"
        y="256.40601"
        id="text892-7-8-1-0-9"><tspan
@@ -782,7 +778,7 @@
          id="tspan890-2-1-5-6-2"
          x="-24.426455"
          y="256.40601"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">sfc_br</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">sfc_br</tspan></text>
     <rect
        style="display:inline;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect5977-9-8-71-7-1"
@@ -811,7 +807,7 @@
        rx="13.834034" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
        x="55.993469"
        y="161.05148"
        id="text1458-5-7"><tspan
@@ -830,7 +826,7 @@
          id="tspan7681-70"
          x="72.38092"
          y="207.71452"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
@@ -841,7 +837,7 @@
          id="tspan7685-0-1"
          x="18.070602"
          y="207.71452"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
     <g
        id="g2807"
        transform="translate(-4)">
@@ -851,7 +847,7 @@
          x="53.709198"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="282.87811"
            x="53.709198"
            id="tspan263-0"
@@ -869,9 +865,9 @@
          id="text892-7-06-88-7"
          y="256.28094"
          x="88.638092"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
            y="256.28094"
            x="88.638092"
            id="tspan890-2-0-9-5"
@@ -887,7 +883,7 @@
        rx="14.465943" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
        x="-106.60316"
        y="161.1617"
        id="text1466-1-9"><tspan
@@ -908,7 +904,7 @@
          id="tspan7681-8-6"
          x="-82.574295"
          y="207.85135"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">wan</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
@@ -919,7 +915,7 @@
          id="tspan7685-0-5-5"
          x="-142.45058"
          y="207.85135"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start">lan</tspan></text>
     <g
        transform="translate(-789.79805,98.53334)"
        style="display:inline"
@@ -930,7 +926,7 @@
          x="619.76776"
          style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.66666698px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start"
            y="184.37215"
            x="619.76776"
            id="tspan263-9-3"
@@ -949,7 +945,7 @@
            ry="9.7688789" />
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
            x="654.4104"
            y="150.88129"
            id="text892-7-8-9-2"><tspan
@@ -957,19 +953,19 @@
              id="tspan890-2-1-9-7"
              x="654.4104"
              y="150.88129"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994">lan_br</tspan></text>
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1">lan_br</tspan></text>
       </g>
     </g>
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
        x="-24.288576"
        y="63.082054"
        id="text5981-3-7-2"><tspan
          sodipodi:role="line"
          x="-24.288574"
          y="63.082054"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.33333302px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:0.99999994"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:13.3333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;stroke-width:1"
          id="tspan5983-4-5-0">uCPE Device 1</tspan></text>
     <g
        transform="translate(-7.9999969)"
@@ -984,7 +980,7 @@
          id="text1450"
          y="404.73138"
          x="-133.32915"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;display:inline;fill:#000000;fill-opacity:1;stroke:none"
          xml:space="preserve"><tspan
            style="font-size:24px"
            y="404.73138"
@@ -1014,7 +1010,7 @@
          style="display:inline">
         <text
            xml:space="preserve"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.66666603px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994;filter:url(#filter4332)"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.6667px;line-height:1.25;font-family:Arial;-inkscape-font-specification:Arial;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;filter:url(#filter4332)"
            x="-0.59244788"
            y="284.13779"
            id="text4338"
@@ -1022,34 +1018,31 @@
              sodipodi:role="line"
              x="-0.59244788"
              y="284.13779"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4344">Legend: </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="320.57343"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.14851379px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:29.1485px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
              id="tspan4348">- Connection via cloud/internet:</tspan><tspan
              id="tspan1311"
              sodipodi:role="line"
              x="-0.59244788"
              y="359.39594"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.79837799px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"><tspan
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.7984px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"><tspan
    id="tspan1379"
-   style="font-size:29.14851379px">- VPN/BTB:</tspan> </tspan><tspan
+   style="font-size:29.1485px">- VPN/BTB:</tspan> </tspan><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="387.31546"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4651" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="410.6488"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4340" /><tspan
              sodipodi:role="line"
              x="-0.59244788"
              y="433.98215"
-             style="text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
              id="tspan4342" /></text>
       </g>
       <g
@@ -1072,29 +1065,26 @@
      id="layer5"
      inkscape:label="btb, internet, ucpe manager"
      transform="translate(200.89436,-53.375023)"
-     style="display:inline">
+     style="display:inline"
+     sodipodi:insensitive="true">
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.3333px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
        x="20.80323"
        y="698.74994"
-       id="text756"><tspan
-         sodipodi:role="line"
-         id="tspan754"
-         x="20.80323"
-         y="717.966" /></text>
+       id="text756" />
     <g
        id="g1813">
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-2-5-5-4-6"
          d="m 472.95984,308.61809 -0.0696,28.15396"
-         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.88743383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.887434;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-2-5-5-4"
          d="m 90.357212,308.60091 -0.06963,28.15396"
-         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.88743383;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#e90000;stroke-width:0.887434;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-2-5-5-4-6-9"
@@ -1102,22 +1092,22 @@
          style="display:inline;fill:#fa5555;fill-opacity:1;stroke:#f30000;stroke-width:0.917;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23513758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47027507, 1.23513754, 0.61756876, 1.23513754;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23514;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47028, 1.23514, 0.617569, 1.23514;stroke-dashoffset:0;stroke-opacity:1"
        d="m 280.32599,373.33137 v 71.44886"
        id="path8471-3-0-5-4-7-6-3-7-2"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23513758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47027507, 1.23513754, 0.61756876, 1.23513754;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23514;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47028, 1.23514, 0.617569, 1.23514;stroke-dashoffset:0;stroke-opacity:1"
        d="m 324.94411,252.1566 v 71.44886"
        id="path8471-3-0-5-4-7-6-3-7"
        inkscape:connector-curvature="0" />
     <path
-       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23818851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.4763771, 1.23818854, 0.61909428, 1.23818854;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:none;stroke:#000000;stroke-width:1.23819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47638, 1.23819, 0.619094, 1.23819;stroke-dashoffset:0;stroke-opacity:1"
        d="M 324.94411,252.15659 H 396.7464"
        id="path8471-3-0-3-8"
        inkscape:connector-curvature="0" />
     <rect
-       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93169;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect5977-9-8-71-3"
        width="11.258382"
        height="23.27355"
@@ -1131,12 +1121,12 @@
          inkscape:connector-curvature="0"
          id="path8471-3-0-5-4-7-6-3-7-20"
          d="m 230.73334,252.1566 v 71.44886"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23513758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47027507, 1.23513754, 0.61756876, 1.23513754;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23514;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47028, 1.23514, 0.617569, 1.23514;stroke-dashoffset:0;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path8471-3-0-3-8-4"
          d="M 230.73334,252.15659 H 158.93105"
-         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23818851;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.4763771, 1.23818854, 0.61909428, 1.23818854;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#000000;stroke-width:1.23819;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.47638, 1.23819, 0.619094, 1.23819;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
          transform="scale(-1,1)"
          rx="1.2365078"
@@ -1145,7 +1135,7 @@
          height="23.27355"
          width="11.258382"
          id="rect5977-9-8-71-3-0"
-         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93168956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.93169;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
     <g
        id="g2541">
@@ -1153,33 +1143,33 @@
          inkscape:connector-curvature="0"
          id="path5091-2-9"
          d="m 285.79578,282.35384 a 38.855204,52.805708 0 0 0 -25.4146,12.9496 27.874385,29.472953 0 0 0 -5.83847,-0.66915 27.874385,29.472953 0 0 0 -23.90343,14.37905 38.701484,43.266581 0 0 0 -3.81757,-0.21342 38.701484,43.266581 0 0 0 -38.70176,43.26683 38.701484,43.266581 0 0 0 10.45454,29.52569 19.427603,20.876675 0 0 0 -0.62526,5.14477 19.427603,20.876675 0 0 0 19.42759,20.87671 19.427603,20.876675 0 0 0 6.81189,-1.33599 17.738246,34.385112 0 0 0 11.77104,8.70425 17.738246,34.385112 0 0 0 10.05859,-6.10906 32.097777,36.841192 0 0 0 22.88385,11.02119 32.097777,36.841192 0 0 0 24.82399,-13.52037 47.301991,30.700992 0 0 0 22.47804,3.69605 47.301991,30.700992 0 0 0 47.30198,-30.70098 47.301991,30.700992 0 0 0 -2.81288,-10.33994 36.611017,34.385112 0 0 0 11.83871,-25.27322 36.611017,34.385112 0 0 0 -36.60986,-34.3851 36.611017,34.385112 0 0 0 -15.08215,3.09888 38.855204,52.805708 0 0 0 -35.04424,-30.11573 z"
-         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.96103942;stroke-opacity:1" />
+         style="fill:#8fd0f6;fill-opacity:1;stroke:#000000;stroke-width:0.961039;stroke-opacity:1" />
       <text
          id="text4180-9-8-7"
          y="359.57266"
          x="238.57793"
-         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99999994"
+         style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.99999994"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;font-family:Arial;-inkscape-font-specification:Arial;font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1"
            y="359.57266"
            x="238.57793"
            id="tspan4178-6-6-2"
            sodipodi:role="line">Internet</tspan></text>
     </g>
     <g
-       id="g1119">
+       id="g219">
       <rect
-         rx="16.219593"
+         rx="19.900242"
          y="445.04919"
-         x="205.9808"
+         x="189.10994"
          height="89.990753"
-         width="148.69037"
+         width="182.4321"
          id="rect5992-9-0"
-         style="fill:#ff9955;fill-opacity:0.64141415;stroke:#000000;stroke-width:0.82419372;stroke-opacity:1"
+         style="fill:#ff9955;fill-opacity:0.641414;stroke:#000000;stroke-width:0.912932;stroke-opacity:1"
          ry="16.015759" />
       <flowRoot
-         transform="matrix(0.89433392,0,0,0.88309463,-246.06529,120.6069)"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:21.33333397px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
+         transform="matrix(1.4158503,0,0,1.398057,-552.21284,-79.033294)"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;line-height:1.25;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none"
          id="flowRoot2130"
          xml:space="preserve"><flowRegion
            id="flowRegion2132"><rect
@@ -1187,10 +1177,10 @@
              x="528.01184"
              height="68.571358"
              width="118.79844"
-             id="rect2134" /></flowRegion><flowPara
-           id="flowPara2136"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">uCPE</flowPara><flowPara
+             id="rect2134"
+             style="stroke-width:1;" /></flowRegion><flowPara
            id="flowPara2138"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.00584412px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Manager</flowPara></flowRoot>    </g>
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.0039px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle">Enea Edge Management</flowPara></flowRoot>
+    </g>
   </g>
 </svg>
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml b/doc/book-enea-edge-example-usecases/doc/introduction.xml
index fc3559b..b502e8b 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml
+++ b/doc/book-enea-edge-example-usecases/doc/introduction.xml
@@ -7,8 +7,8 @@
   etc.</para>
 
   <para>Before running any example use case make sure the uCPE device(s) have
-  been added to the uCPE Manager and placed on the map. For detailed
-  information on how to add a device to the uCPE Manager, how to configure the
+  been added to Enea Edge Management and placed on the map. For detailed
+  information on how to add a device to Enea Edge Management, how to configure the
   network interfaces to use DPDK, PCI-passthrough or SR-IOV drivers, or VNF
   configuration, please refer to the <xi:include
   href="../../s_docbuild/olinkdb/pardoc-common.xml"
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
index 1f3a6ce..bb05905 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/service_chaining_128t_fortigate.xml
+++ b/doc/book-enea-edge-example-usecases/doc/service_chaining_128t_fortigate.xml
@@ -3,7 +3,7 @@
   <title>Service Chaining 128T - Fortigate Example Use-case</title>
 
   <para>The following is an example of how to setup and configure a service
-  chain on top of the Enea NFV Access virtualization platform, using the
+  chain on top of the Enea Edge Runtime, using the
   following commercial VNFs: 128T router and FortiGate.</para>
 
   <section id="prereq_serv_chain_cust">
@@ -86,7 +86,7 @@
       <para><emphasis role="bold">Configuring Network Interfaces on uCPE
       devices:</emphasis><orderedlist>
           <listitem>
-            <para>Add the trgt uCPE device into the uCPE Manager:
+            <para>Add the trgt uCPE device into Enea Edge Management:
             <literal>Devices -&gt; Manage -&gt; Add</literal>, and fill in the
             required fields with the following data:</para>
 
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml b/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
index 8b82337..24442af 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/vnf_chaining.xml
+++ b/doc/book-enea-edge-example-usecases/doc/vnf_chaining.xml
@@ -11,9 +11,9 @@
 
   <para>The following is an example of how to setup and configure a
   branch-to-branch service comprised on two commercial VNFs (SD-WAN +
-  Firewall). This service will run in a service chain on top of the Enea NFV
-  Access virtualization platform, deployed through the Enea uCPE
-  Manager.</para>
+  Firewall). This service will run in a service chain on top of the Enea
+  Edge Runtime, deployed through the Enea Edge
+  Management.</para>
 
   <para>In the example setup the following commercial VNFs are used: Juniper
   vSRX as the SD-WAN VNF and Fortigate as the Router/Firewall.</para>
@@ -61,7 +61,7 @@
         </listitem>
 
         <listitem>
-          <para>VNF Configuration files, provided with your Enea NFV Access
+          <para>VNF Configuration files, provided with your Enea Edge
           Release:</para>
 
           <itemizedlist spacing="compact">
@@ -152,7 +152,7 @@
             <para>The networking setup (Steps 1-3) can be modeled using the
             Offline Configuration entry, so that it is automatically
             provisioned on the uCPE device, once it gets enrolled into the
-            management system (uCPE Manager).</para>
+            management system (Enea Edge Management).</para>
           </note>
         </listitem>
       </orderedlist>
diff --git a/doc/book-enea-nfv-access-getting-started/swcomp.mk b/doc/book-enea-edge-example-usecases/swcomp.mk
index ca6439f..83f672c 100755
--- a/doc/book-enea-nfv-access-getting-started/swcomp.mk
+++ b/doc/book-enea-edge-example-usecases/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-getting-started
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Getting Started"
+BOOKPACKAGES := book-enea-edge-example-usecases
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Example Use-cases"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
index 71ee775..18c1545 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="advanced_conf">
@@ -12,26 +12,24 @@
     <title>Bare Metal Provisioning</title>
 
     <para>Bare Metal Provisioning can be used for automated deployment of the
-    Enea NFV Access Runtime Platform on a large number of uCPE devices. The
-    uCPE devices may have no previous operating system installed, or are
-    reinstalled without preserving any existing data. Enea NFV Access Bare
-    Metal Provisioning is based on standardized Pre-Boot Execution environment
-    (PXE) booting.</para>
+    Enea Edge Runtime on a large number of uCPE devices. The uCPE devices may
+    have no previous operating system installed, or are reinstalled without
+    preserving any existing data. Enea Edge Bare Metal Provisioning is based
+    on standardized Pre-Boot Execution environment (PXE) booting.</para>
 
     <para>The Bare Metal Provisioning process begins by PXE booting an Enea
-    NFV Access installer <literal>initramfs</literal> image. The installer
-    downloads a configuration file, as well as the Enea NFV Access Runtime
-    Platform image and then proceeds to install the system by dividing the
-    disk into 2 partitions: a GPT partition containing the GRUB boot loader
-    and a second partition containing the Enea NFV Access Runtime Platform
-    root filesystem. When the installation is complete, the uCPE device is
-    automatically rebooted into Enea NFV Access Runtime Platform.</para>
+    Edge installer <literal>initramfs</literal> image. The installer downloads
+    a configuration file, as well as the Enea Edge Runtime image and then
+    proceeds to install the system by dividing the disk into 2 partitions: a
+    GPT partition containing the GRUB boot loader and a second partition
+    containing the Enea Edge Runtime root filesystem. When the installation is
+    complete, the uCPE device is automatically rebooted into Enea Edge
+    Runtime.</para>
 
     <note>
       <para>The <literal>.hddimg</literal>, <literal>initramfs</literal>, and
       <literal>bzImage</literal> files are available in the
-      <filename>Enea_NFV_Access_Run_Time_Platform_
-      &lt;processor&gt;_&lt;version&gt;-&lt;build_number&gt;.tar.gz</filename>
+      <filename>Enea_Edge_Runtime_&lt;processor&gt;_&lt;version&gt;-&lt;build_number&gt;.tar.gz</filename>
       file you downloaded with your release.</para>
     </note>
 
@@ -56,16 +54,15 @@
 
         <listitem>
           <para>The uCPE devices are preconfigured in BIOS to boot from the
-          hard drive where the Enea NFV Access Runtime Platform will be
-          installed.</para>
+          hard drive where the Enea Edge Runtime will be installed.</para>
         </listitem>
 
         <listitem>
           <para>CSM support and Dual Boot must be enabled in BIOS (i.e. PXE
-          booting in legacy mode), while the final Enea NFV Access image will
-          boot in UEFI mode. Doing a mass deployment using legacy PXE booting
-          usually means that Secure Boot is disabled, Secure Boot will need to
-          be enabled afterwards.</para>
+          booting in legacy mode), while the final Enea Edge Runtime image
+          will boot in UEFI mode. Doing a mass deployment using legacy PXE
+          booting usually means that Secure Boot is disabled, Secure Boot will
+          need to be enabled afterwards.</para>
         </listitem>
 
         <listitem>
@@ -80,23 +77,22 @@
     <section id="bare_meta_prov_server">
       <title>Server Configuration</title>
 
-      <para>The following images provided with your Enea NFV Access release
-      need to be made available on the PXE and HTTP servers:</para>
+      <para>The following images provided with your Enea Edge release need to
+      be made available on the PXE and HTTP servers:</para>
 
       <orderedlist>
         <listitem>
-          <para>Copy the Enea NFV Access installer
-          <literal>initramfs</literal> image and kernel
-          <literal>bzImage</literal> for your uCPE device architecture to the
-          TFTP directory on the PXE server (e.g
+          <para>Copy the Enea Edge installer <literal>initramfs</literal>
+          image and kernel <literal>bzImage</literal> for your uCPE device
+          architecture to the TFTP directory on the PXE server (e.g
           <literal>/var/lib/tftpboot</literal>).</para>
         </listitem>
 
         <listitem>
-          <para>Compress the Enea NFV Access Runtime Platform
-          <literal>.hddimg</literal> image for the uCPE device architecture
-          using <literal>gzip</literal> and copy the resulting
-          <literal>hddimg.gz</literal> file to the HTTP server.</para>
+          <para>Compress the Enea Edge Runtime <literal>.hddimg</literal>
+          image for the uCPE device architecture using <literal>gzip</literal>
+          and copy the resulting <literal>hddimg.gz</literal> file to the HTTP
+          server.</para>
         </listitem>
       </orderedlist>
 
@@ -113,7 +109,7 @@
         <itemizedlist>
           <listitem>
             <para><literal>image_url</literal>. The HTTP server URL used for
-            downloading the Enea NFV Access Runtime Platform image.</para>
+            downloading the Enea Edge Runtime image.</para>
           </listitem>
         </itemizedlist>
 
@@ -122,7 +118,7 @@
         <itemizedlist>
           <listitem>
             <para><literal>install_drive</literal>. The name of the drive
-            where the Enea NFV Access Runtime Platform will be installed (e.g
+            where the Enea Edge Runtime will be installed (e.g
             <literal>/dev/sda</literal>). If not set, the installer will use
             the largest detected (non-USB) drive on the uCPE device.</para>
           </listitem>
@@ -149,10 +145,10 @@ install_drive = /dev/sda</programlisting>
       <section id="bare_meta_prov_pxe">
         <title>PXE Configuration</title>
 
-        <para>A PXE entry for the Enea NFV Access installation needs to be
-        added as the default boot selection in the pxelinux configuration file
-        (e.g <literal>/var/lib/tftpboot/pxelinux.cfg/default</literal>). The
-        PXE entry should have the following settings:</para>
+        <para>A PXE entry for the Enea Edge installation needs to be added as
+        the default boot selection in the pxelinux configuration file (e.g
+        <literal>/var/lib/tftpboot/pxelinux.cfg/default</literal>). The PXE
+        entry should have the following settings:</para>
 
         <programlisting>default nfv_access
 label nfv_access
@@ -179,8 +175,8 @@ ipappend 2</programlisting>
 ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&gt; power reset   </programlisting>
 
       <para>The uCPE devices should be configured in BIOS to boot from the
-      installation drive first in order to automatically start the Enea NFV
-      Access Runtime Platform when the installation is finished.</para>
+      installation drive first in order to automatically start the Enea Edge
+      Runtime when the installation is finished.</para>
     </section>
   </section>
 
@@ -205,7 +201,7 @@ ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&
     <section id="secure_boot_keys">
       <title>Enabling UEFI Secure Boot</title>
 
-      <para>All Enea NFV Access image artifacts delivered with the release are
+      <para>All Enea Edge image artifacts delivered with the release are
       signed using the Enea UEFI Secure boot private keys. These artifacts can
       be used on a uCPE device that doesn't have Secure Boot enabled. To use
       the Secure Boot feature, however, the user must make the Enea UEFI
@@ -247,9 +243,9 @@ ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&
         </itemizedlist>
 
         <para>The Enea UEFI Secure Boot certificates are installed together
-        with the Enea NFV Access Runtime Platform onto the hard drive. They
-        can be found on the EFI partition (usually the first partition of the
-        drive) under <literal>/uefi_sb_keys</literal>.</para>
+        with the Enea Edge Runtime onto the hard drive. They can be found on
+        the EFI partition (usually the first partition of the drive) under
+        <literal>/uefi_sb_keys</literal>.</para>
 
         <para>These certificates need to be manually enrolled in BIOS. The
         exact details on how to proceed may vary depending the version of the
@@ -278,12 +274,12 @@ ipmitool -U &lt;user&gt; -P &lt;password&gt; -H &lt;uCPE device IPMI IP address&
     are contiguous blocks of memory that come in 2MB or 1GB sizes. By using
     huge page allocations, less memory is used for page tables and the
     Translation Lookaside Buffer (TLB) miss rate is significantly reduced.
-    Enea NFV Access uses huge page backed memory in KVM guests in order to
+    Enea Edge Runtime uses huge page backed memory in KVM guests in order to
     improve performance.</para>
 
-    <para>Enea NFV Access implements an automatic hugepage allocation service
-    that is triggered at each startup. The service is skipped if hugepages
-    have been allocated in the kernel boot command line.</para>
+    <para>Enea Edge Runtime implements an automatic hugepage allocation
+    service that is triggered at each startup. The service is skipped if
+    hugepages have been allocated in the kernel boot command line.</para>
 
     <para>There are two strategies outlined for hugepage allocation:</para>
 
@@ -421,12 +417,13 @@ node0.1048576kB = 3 </programlisting>
     </section>
   </section>
 
+
   <section condition="hidden" id="high_availability_ig">
-    <title>Installing the Enea uCPE Manager in High Availability Mode</title>
+    <title>Installing the Enea Edge Management in High Availability Mode</title>
 
-    <para>The following describes the setup needed for running the Enea uCPE
-    Manager in High Availabilty (HA) mode, with a MariaDB database cluster. A
-    setup example is illustrated in the diagram below.</para>
+    <para>The following describes the setup needed for running the Enea Edge
+    Management in High Availabilty (HA) mode, with a MariaDB database cluster.
+    A setup example is illustrated in the diagram below.</para>
 
     <figure>
       <title>The High Availability setup</title>
@@ -442,17 +439,17 @@ node0.1048576kB = 3 </programlisting>
     <para>The setup consists of two sub-clusters, placed in different
     geographical locations, each consisting of three MariaDB servers. In this
     example, two of the machines are running only MariaDB, while the rest are
-    hosting a MariaDB server and an Enea uCPE Manager instance. The entire
+    hosting a MariaDB server and an Enea Edge Management instance. The entire
     network is hidden behind a firewall that performs NAT. While in protection
-    (cluster) mode, the Enea uCPE Manager instances promote a Virtual IP (VIP)
-    that represents the IP address of the entire cluster. The firewall in this
-    case will allocate a public IP for the outside world that will be
+    (cluster) mode, the Enea Edge Management instances promote a Virtual IP
+    (VIP) that represents the IP address of the entire cluster. The firewall
+    in this case will allocate a public IP for the outside world that will be
     translated into the VIP. Also in this example, the traffic towards the
     cluster from outside the firewall is done through HTTPS, which will be
     translated to HTTP inside the private network.</para>
 
     <note>
-      <para>By default, communication to the Enea uCPE Manager is done with
+      <para>By default, communication to the Enea Edge Management is done with
       HTTPS. To enable HTTP, go to <emphasis role="bold">System</emphasis>,
       <emphasis role="bold">Configuration</emphasis>, click on the <emphasis
       role="bold">Web Access</emphasis> tab and check the <emphasis
@@ -467,7 +464,7 @@ node0.1048576kB = 3 </programlisting>
 
       <itemizedlist>
         <listitem>
-          <para>Machines running the Enea uCPE Manager and MariaDB:</para>
+          <para>Machines running the Enea Edge Management and MariaDB:</para>
 
           <itemizedlist spacing="compact">
             <listitem>
@@ -509,9 +506,9 @@ node0.1048576kB = 3 </programlisting>
 
       <para>Please refer to <olink
       targetdoc="book_enea_nfv_access_getting_started"
-      targetptr="firewall_config">Firewall Configuration in the <ns:include
+      targetptr="firewall_config">Firewall Configuration in the <xi:include
       href="../../s_docbuild/olinkdb/pardoc-names.xml"
-      xmlns:ns="http://www.w3.org/2001/XInclude"
+      xmlns:xi="http://www.w3.org/2001/XInclude"
       xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
       Manual. In addition, the following configuration is needed:</para>
 
@@ -533,10 +530,10 @@ SELINUXTYPE=targeted</programlisting>
       </orderedlist>
 
       <para>The following ports should be opened in the local firewall (not
-      the one doing NAT), for each Enea uCPE Manager machine:</para>
+      the one doing NAT), for each Enea Edge Management machine:</para>
 
       <table>
-        <title>Ports for Enea uCPE Manager Machines</title>
+        <title>Ports for Enea Edge Management Machines</title>
 
         <tgroup cols="2">
           <colspec align="left" />
@@ -590,7 +587,7 @@ SELINUXTYPE=targeted</programlisting>
       </table>
 
       <para>For MariaDB, the following ports must be opened (on each MariaDB
-      server, including the ones hosting the Enea uCPE Manager):</para>
+      server, including the ones hosting the Enea Edge Management):</para>
 
       <table>
         <title>Ports for MariaDB Machines</title>
@@ -685,9 +682,9 @@ SELINUXTYPE=targeted</programlisting>
     <section id="ha_installation">
       <title>Installing High Availability</title>
 
-      <para>The Enea uCPE Manager can be installed in High Availability mode
-      with a MariaDB database cluster by performing the following steps. The
-      mandatory Java configuration is also detailed.</para>
+      <para>The Enea Edge Management can be installed in High Availability
+      mode with a MariaDB database cluster by performing the following steps.
+      The mandatory Java configuration is also detailed.</para>
 
       <section id="ha_mariadb">
         <title>Installing and configuring the MariaDB cluster</title>
@@ -825,20 +822,20 @@ Switch to unix_socket authentication [Y/n] <emphasis role="bold">Y</emphasis>
 Enabled successfully!
 Reloading privilege tables..
  ... Success!
-…
+&hellip;
 Change the root password? [Y/n] <emphasis role="bold">Y</emphasis>
 New password: 
 Re-enter new password: 
 Password updated successfully!
 Reloading privilege tables..
  ... Success!
-…
+&hellip;
 Remove anonymous users? [Y/n] <emphasis role="bold">Y</emphasis>
  ... Success!
-…
+&hellip;
 Disallow root login remotely? [Y/n] <emphasis role="bold">Y</emphasis>
  ... Success!
-…
+&hellip;
 Remove test database and access to it? [Y/n] <emphasis role="bold">Y (optional)</emphasis>
  - Dropping test database...
  ... Success!
@@ -875,9 +872,9 @@ TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
         <para>Please refer to <olink
         targetdoc="book_enea_nfv_access_getting_started"
         targetptr="openjdk_postgresql_config">Configuring OpenJDK and
-        PostgreSQL in the <ns:include
+        PostgreSQL in the <xi:include
         href="../../s_docbuild/olinkdb/pardoc-names.xml"
-        xmlns:ns="http://www.w3.org/2001/XInclude"
+        xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
         Manual, for details on how to install and configure Java
         OpenJDK.</para>
@@ -891,16 +888,16 @@ TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
       </section>
 
       <section id="ha_ucpe_mg">
-        <title>Installing the Enea uCPE Manager in High Availabilty
+        <title>Installing the Enea Edge Management in High Availabilty
         mode</title>
 
         <para>These steps must be taken on each of the CentOS 7 machines that
-        will host the Enea uCPE Manager. The Enea uCPE Manager will be
+        will host the Enea Edge Management. The Enea Edge Management will be
         installed and the setup for the external database cluster will be
         prepared.</para>
 
-        <para>As the root user, go to the distribution folder of the Enea uCPE
-        Manager, and run:</para>
+        <para>As the root user, go to the distribution folder of the Enea Edge
+        Management, and run:</para>
 
         <programlisting>[root@localhost distro]#./install.sh /opt/ \
 Enea_NFV_Access_uCPEManager_2.3.0-build23.tar.gz
@@ -911,7 +908,7 @@ External database selected, getting user information ...
 Press 1 for PostgreSQL, 2 for MariaDB, 3 for SQL Server, 4 for Oracle and 5 \
 for MySQL: <emphasis role="bold">2</emphasis>
 Specify database server name(s) or IP Address(es): \
-<emphasis role="bold">192.168.10.11,192.168.10.12,…,192.168.10.16 *(see note)</emphasis>
+<emphasis role="bold">192.168.10.11,192.168.10.12,&hellip;,192.168.10.16 *(see note)</emphasis>
 Specify database ID (or name) [ucpemanager]: 
 Specify database server port [3306]: 
 Specify database user name [root]: enea
@@ -920,11 +917,11 @@ Specify database startup thread pool size [1]:
 Creating database configuration file \
 /opt//ucpemanager/application/config/databaseConfig.xml ...
 Done .
-…
+&hellip;
 Installing ucpemanager service ..
 Specify service username [ucpemanager]: 
 Specify service password [ucpemanager]: somepassword
-…
+&hellip;
 Specify the IP address of the local interface: <emphasis role="bold">192.168.10.11</emphasis>
 Is this server part of a cluster? [Y/N]: <emphasis role="bold">Y</emphasis>
 Specify the name of the cluster [ucpemanager]: 
@@ -934,9 +931,9 @@ HA Configuration files modified successfully.
 Configuration complete.</programlisting>
 
         <note>
-          <para>For each Enea uCPE Manager installation, place the local
+          <para>For each Enea Edge Management installation, place the local
           interface IP first in the list of IPs. This will optimize database
-          communication, since the Enea uCPE Manager uses the list of IPs
+          communication, since the Enea Edge Management uses the list of IPs
           sequentially, therefore using the internal loopback interface for
           communicating with the database.</para>
         </note>
@@ -944,8 +941,8 @@ Configuration complete.</programlisting>
         <para>Once the servers are up and running, log into the <emphasis
         role="bold">Primary</emphasis> and go to <emphasis
         role="bold">System</emphasis> and select <emphasis role="bold">Cluster
-        View</emphasis>. The list of Enea uCPE Managers should be displayed,
-        with one listed as Primary and the rest as Backup.</para>
+        View</emphasis>. The list of Enea Edge Management servers should be
+        displayed, with one listed as Primary and the rest as Backup.</para>
       </section>
     </section>
 
@@ -977,7 +974,7 @@ Configuration complete.</programlisting>
           <para>Run the upgrade process on <literal>ucpeManager-3</literal>
           and <literal>ucpeManager-4</literal>. This will upgrade the service
           to the current release. Once the upgrade process completes, shutdown
-          the Enea uCPE Manager service on both machines.</para>
+          the Enea Edge Management service on both machines.</para>
         </listitem>
 
         <listitem>
@@ -989,10 +986,11 @@ Configuration complete.</programlisting>
         </listitem>
 
         <listitem>
-          <para>Shutdown the MariaDB-2 process and run the Enea uCPE Manager
-          upgrade process on <literal>ucpeManager-2</literal>. This will
-          upgrade the service to the current release. Once the upgrade process
-          completes, shutdown the uCPE Manager service on the machine.</para>
+          <para>Shutdown the MariaDB-2 process and run the Enea Edge
+          Management upgrade process on <literal>ucpeManager-2</literal>. This
+          will upgrade the service to the current release. Once the upgrade
+          process completes, shutdown the Enea Edge Management service on the
+          machine.</para>
         </listitem>
 
         <listitem>
@@ -1013,7 +1011,7 @@ Configuration complete.</programlisting>
         </listitem>
 
         <listitem>
-          <para>Start the Enea uCPE Manager services on
+          <para>Start the Enea Edge Management services on
           <literal>ucpeManager-2</literal>. This machine will come up as the
           new "PRIMARY" with the upgraded software. As part of the startup
           process, it will upgrade the database and perform any other
@@ -1026,14 +1024,14 @@ Configuration complete.</programlisting>
         </listitem>
 
         <listitem>
-          <para>Start the Enea uCPE Manager services on
+          <para>Start the Enea Edge Management services on
           <literal>ucpeManager-3</literal> and
           <literal>ucpeManager-4</literal>. At this point, we are in
           highly-available mode.</para>
         </listitem>
 
         <listitem>
-          <para>Upgrade the Enea uCPE Manager on
+          <para>Upgrade the Enea Edge Management on
           <literal>ucpeManager-1</literal> (the one that has been shut down).
           Once that upgrade is complete and the service restarts, the entire
           setup has been upgraded to the new version.</para>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/book.xml b/doc/book-enea-edge-getting-started/doc/book.xml
index fa3fc4f..f02f770 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/book.xml
+++ b/doc/book-enea-edge-getting-started/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_getting_started">
-  <title><trademark class="registered">Enea</trademark> NFV Access Getting Started</title>
+<book id="book_enea_edge_getting_started">
+  <title><trademark class="registered">Enea</trademark> Edge Getting Started</title>
 
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
diff --git a/doc/book-enea-nfv-access-getting-started/doc/grafana.xml b/doc/book-enea-edge-getting-started/doc/grafana.xml
index 8278261..5dfaa98 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/grafana.xml
+++ b/doc/book-enea-edge-getting-started/doc/grafana.xml
@@ -87,7 +87,7 @@
       <orderedlist>
         <listitem>
           <para>Extract
-          <filename>Enea_NFV_Access_Telemetry_Deploy_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>.</para>
+          <filename>Enea_Edge_Telemetry_Deploy_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>.</para>
 
           <para>The directory in which the archive will be unpacked will be
           denoted as: <literal>&lt;Telemetry-installdir&gt;</literal>.</para>
@@ -121,7 +121,7 @@
         <listitem>
           <para>During the InfluxDB deployment, you will be prompted to
           provide a username and password. These must match the ones
-          configured in the Enea uCPE Manager for Telemetry.</para>
+          configured in the Enea Edge Management for Telemetry.</para>
 
           <note>
             <para>Changing the InfluxDB username and password requires
@@ -220,7 +220,7 @@
             <entry>Grafana Dashboard</entry>
 
             <entry>The dashboard that should be used when opening Grafana
-            using the Enea uCPE Manager.</entry>
+            using the Enea Edge Management.</entry>
 
             <entry>host</entry>
           </row>
@@ -265,7 +265,7 @@
     </table>
 
     <para>When changing any of the settings in the <emphasis
-    role="bold">Telemetry</emphasis> tab, the Enea uCPE Manager will inform
+    role="bold">Telemetry</emphasis> tab, the Enea Edge Management will inform
     all uCPE devices of the change if they have telemetry running.</para>
 
     <figure>
@@ -288,7 +288,7 @@
     Telemetry</emphasis> and <emphasis role="bold">Stop Telemetry</emphasis>
     options are available.</para>
 
-    <para>When starting Telemetry for a uCPE device, the Enea uCPE Manager
+    <para>When starting Telemetry for a uCPE device, the Enea Edge Management
     sends the following information about the InfluxDB:</para>
 
     <itemizedlist>
@@ -310,7 +310,8 @@
     <para>These fields are read-only and are populated with the values already
     set in the <emphasis role="bold">System Configuration</emphasis>. If one
     of the fields is not set or if it does not have the desired value, modify
-    it in the <emphasis role="bold">System Configuration</emphasis>.</para>
+    it in the <emphasis role="bold">System Configuration</emphasis>. The
+    password is sent encrypted using the Base64 scheme.</para>
 
     <figure>
       <title>Telemetry Start Dialog</title>
@@ -323,8 +324,8 @@
     </figure>
 
     <para>When the Telemetry status is changed on a uCPE device, a
-    notification is sent to the Enea uCPE Manager. These notifications can be
-    inspected under <emphasis role="bold">Fault</emphasis> found in the
+    notification is sent to the Enea Edge Management. These notifications can
+    be inspected under <emphasis role="bold">Fault</emphasis> found in the
     <emphasis role="bold">Event</emphasis> menu.</para>
   </section>
 
@@ -343,4 +344,4 @@
     <emphasis role="bold">Telemetry</emphasis> tab. The default dashboard
     available when launching Grafana can be customized as well.</para>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/archive_list.png b/doc/book-enea-edge-getting-started/doc/images/archive_list.png
index 302f32d..302f32d 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/archive_list.png
+++ b/doc/book-enea-edge-getting-started/doc/images/archive_list.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/collect_debug_logs.png b/doc/book-enea-edge-getting-started/doc/images/collect_debug_logs.png
index 6582737..6582737 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/collect_debug_logs.png
+++ b/doc/book-enea-edge-getting-started/doc/images/collect_debug_logs.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/debug_settings.png b/doc/book-enea-edge-getting-started/doc/images/debug_settings.png
index 2c97b2c..2c97b2c 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/debug_settings.png
+++ b/doc/book-enea-edge-getting-started/doc/images/debug_settings.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/dev_file_mg.png b/doc/book-enea-edge-getting-started/doc/images/dev_file_mg.png
index a4a4f5c..a4a4f5c 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/dev_file_mg.png
+++ b/doc/book-enea-edge-getting-started/doc/images/dev_file_mg.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/download_files.png b/doc/book-enea-edge-getting-started/doc/images/download_files.png
index cb686e4..cb686e4 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/download_files.png
+++ b/doc/book-enea-edge-getting-started/doc/images/download_files.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/edit_inter.png b/doc/book-enea-edge-getting-started/doc/images/edit_inter.png
index fddde37..fddde37 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/edit_inter.png
+++ b/doc/book-enea-edge-getting-started/doc/images/edit_inter.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/edit_inter_config.png b/doc/book-enea-edge-getting-started/doc/images/edit_inter_config.png
index f9ab8aa..f9ab8aa 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/edit_inter_config.png
+++ b/doc/book-enea-edge-getting-started/doc/images/edit_inter_config.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/fault_events.png b/doc/book-enea-edge-getting-started/doc/images/fault_events.png
index aeec955..aeec955 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/fault_events.png
+++ b/doc/book-enea-edge-getting-started/doc/images/fault_events.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/high_av_setup.png b/doc/book-enea-edge-getting-started/doc/images/high_av_setup.png
new file mode 100644
index 0000000..d119ecb
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/high_av_setup.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/onboard_a_vnf_image.png b/doc/book-enea-edge-getting-started/doc/images/onboard_a_vnf_image.png
index da52202..da52202 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/onboard_a_vnf_image.png
+++ b/doc/book-enea-edge-getting-started/doc/images/onboard_a_vnf_image.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/ovs_bridges_tab.png b/doc/book-enea-edge-getting-started/doc/images/ovs_bridges_tab.png
index 0b3ec54..0b3ec54 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/ovs_bridges_tab.png
+++ b/doc/book-enea-edge-getting-started/doc/images/ovs_bridges_tab.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/prep_deploy.png b/doc/book-enea-edge-getting-started/doc/images/prep_deploy.png
index 2db2487..2db2487 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/prep_deploy.png
+++ b/doc/book-enea-edge-getting-started/doc/images/prep_deploy.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/prep_execution.png b/doc/book-enea-edge-getting-started/doc/images/prep_execution.png
index 404760b..404760b 100755
--- a/doc/book-enea-nfv-access-getting-started/doc/images/prep_execution.png
+++ b/doc/book-enea-edge-getting-started/doc/images/prep_execution.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/telemetry_settings.png b/doc/book-enea-edge-getting-started/doc/images/telemetry_settings.png
index 276b716..276b716 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/images/telemetry_settings.png
+++ b/doc/book-enea-edge-getting-started/doc/images/telemetry_settings.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/telemetry_start.png b/doc/book-enea-edge-getting-started/doc/images/telemetry_start.png
index 81510b5..81510b5 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/images/telemetry_start.png
+++ b/doc/book-enea-edge-getting-started/doc/images/telemetry_start.png
diff --git a/doc/book-enea-edge-getting-started/doc/images/vnf_space.png b/doc/book-enea-edge-getting-started/doc/images/vnf_space.png
new file mode 100755
index 0000000..57ed581
--- /dev/null
+++ b/doc/book-enea-edge-getting-started/doc/images/vnf_space.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/wap_external_interface.png b/doc/book-enea-edge-getting-started/doc/images/wap_external_interface.png
index ee49fc1..ee49fc1 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/images/wap_external_interface.png
+++ b/doc/book-enea-edge-getting-started/doc/images/wap_external_interface.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/wap_wireless_ap.png b/doc/book-enea-edge-getting-started/doc/images/wap_wireless_ap.png
index b7c77bf..b7c77bf 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/images/wap_wireless_ap.png
+++ b/doc/book-enea-edge-getting-started/doc/images/wap_wireless_ap.png
diff --git a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
index 981b536..50a90b0 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="installation_guide">
-  <title>Setting up and Installing the Enea NFV Access Base
-  Configuration</title>
+  <title>Setting up and Installing the Enea Edge 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
@@ -19,11 +18,11 @@
 
         <note>
           <para>The CentOS 7 server must be updated to the latest revision
-          before installing Enea NFV Access.</para>
+          before installing Enea Edge.</para>
         </note>
 
         <para>The following will detail CPU, RAM and storage requirements for
-        the uCPE Manager.</para>
+        the Enea Edge Management.</para>
 
         <itemizedlist>
           <listitem>
@@ -81,31 +80,30 @@
           </listitem>
         </itemizedlist>
 
-        <para>The purpose of the CentOS 7 server is to host the Enea uCPE
-        Manager. Network access between the CentOS 7 server and the uCPE
-        devices is required. The Enea uCPE Manager and the uCPE devices will
-        be connected on separate subnets to avoid inconsistencies.</para>
+        <para>The purpose of the CentOS 7 server is to host the Enea Edge
+        Management. Network access between the CentOS 7 server and the uCPE
+        devices is required. The Enea Edge Management and the uCPE devices
+        will be connected on separate subnets to avoid inconsistencies.</para>
       </listitem>
 
       <listitem>
         <para>One or more uCPE devices.</para>
 
-        <para>Whitebox devices where the Enea NFV Access Runtime 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>
+        <para>Whitebox devices where the Enea Edge Runtime 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>
 
         <para>When hosting an entire solution including one or several network
         services, the hardware must also have the resources to host one or
         more VNFs. During a typical evaluation, a dual VNF service on the Enea
-        NFV Access Runtime Platform needs a CPU with 4-8 cores and at least 8
-        GB RAM. The supported Intel CPUs of Enea NFV Access are documented in
-        the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        Edge Runtime needs a CPU with 4-8 cores and at least 8 GB RAM. The
+        supported Intel CPUs of Enea Edge are documented in 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.</para>
 
-        <para>Enea NFV Access needs EFI support in BIOS to boot. When
+        <para>Enea Edge Runtime needs EFI support in BIOS to boot. When
         configuring the uCPE device BIOS a serial connection is
         required.</para>
       </listitem>
@@ -117,12 +115,11 @@
 
         <itemizedlist>
           <listitem>
-            <para>Installing the Enea NFV Access Runtime Platform on uCPE
-            Devices.</para>
+            <para>Installing the Enea Edge Runtime on uCPE Devices.</para>
           </listitem>
 
           <listitem>
-            <para>Connecting to the GUI of the Enea uCPE Manager for
+            <para>Connecting to the GUI of the Enea Edge Management 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"
@@ -150,9 +147,9 @@
 
       <para>Any firewall running on the CentOS 7 server may block the
       management protocols required to communicate between the uCPE device and
-      the Enea uCPE Manager as well as between the Enea uCPE Manager and its
-      northbound clients. Quick handling of a blocking firewall would be to
-      disable it, typical for a lab environment, through:</para>
+      the Enea Edge Management as well as between the Enea Edge Management and
+      its northbound clients. Quick handling of a blocking firewall would be
+      to disable it, typical for a lab environment, through:</para>
 
       <programlisting>sudo systemctl stop firewalld
 sudo systemctl disable firewalld
@@ -189,7 +186,9 @@ sudo systemctl mask now firewalld</programlisting>
 
               <entry>UDP</entry>
 
-             <entry condition="hidden">Required for the Enea uCPE Manager High Availability
+
+             <entry condition="hidden">Required for the Enea Edge Management High Availability
+
               Configuration.</entry>
             </row>
 
@@ -198,7 +197,8 @@ sudo systemctl mask now firewalld</programlisting>
 
               <entry>TCP</entry>
 
-              <entry condition="hidden">Required for the Enea uCPE Manager High Availability
+              <entry condition="hidden">Required for the Enea Edge Management High Availability
+
               Configuration.</entry>
             </row>
 
@@ -223,7 +223,7 @@ sudo systemctl mask now firewalld</programlisting>
       </table>
 
       <para>Use the following command sequence to enable the required ports
-      for deployment of the Enea uCPE Manager:</para>
+      for deployment of the Enea Edge Management:</para>
 
       <programlisting>sudo firewall-cmd --permanent --add-port=80/tcp
 sudo firewall-cmd --permanent --add-port=443/tcp
@@ -234,21 +234,21 @@ sudo firewall-cmd --permanent --add-port=2021-2040/tcp
 sudo firewall-cmd --reload</programlisting>
 
       <note>
-        <para>If the uCPE Manager host resides behind a corporate
+        <para>If the Enea Edge Management host resides behind a corporate
         port-filtering firewall, then all the aforementioned ports need to
         also be enabled on the respective firewall. As an additional
         requirement, port 22/TCP also needs to be enabled for reverse SSH to
-        the Enea uCPE Manager.</para>
+        the Enea Edge Management.</para>
 
         <para>No enabling and no forwarding rules are necessary for ports
-        2021-2040 if the version of Enea NFV Access is 2.4.0 or newer.</para>
+        2021-2040 if using Enea Edge 2.4.0 or newer.</para>
       </note>
     </section>
 
     <section id="openjdk_postgresql_config">
       <title>Configuring OpenJDK and PostgreSQL</title>
 
-      <para>The Enea uCPE Manager requires a specific Java version (OpenJDK
+      <para>The Enea Edge Management requires a specific Java version (OpenJDK
       11) and a PostgreSQL version to operate correctly.</para>
 
       <para><emphasis role="bold">Installing OpenJDK</emphasis></para>
@@ -263,9 +263,9 @@ sudo firewall-cmd --reload</programlisting>
         <listitem>
           <para>Verify the installation:</para>
 
-          <programlisting>java -version 
-openjdk version "11.0.3" 2019-04-16 LTS 
-OpenJDK Run Time Environment 18.9 (build 11.0.3+7-LTS) 
+          <programlisting>java -version
+openjdk version "11.0.3" 2019-04-16 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>
@@ -286,7 +286,7 @@ OpenJDK 64-Bit Server VM 18.9 (build 11.0.3+7-LTS, mixed mode, sharing)</program
           installation:</para>
 
           <programlisting>export JAVA_HOME=$(dirname $(dirname $(readlink $(readlink $(which java)))))
-export PATH=$PATH:$JAVA_HOME/bin 
+export PATH=$PATH:$JAVA_HOME/bin
 export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</programlisting>
 
           <note>
@@ -299,8 +299,8 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</p
         </listitem>
       </orderedlist>
 
-      <para>The Enea uCPE Manager requires a specific PostgreeSQL version.
-      This is embedded in the Enea uCPE Manager installation. In order to
+      <para>The Enea Edge Management requires a specific PostgreeSQL version.
+      This is embedded in the Enea Edge Management installation. In order to
       avoid conflicts, any existing PostgreeSQL installation needs to be
       uninstalled.</para>
 
@@ -324,8 +324,8 @@ export CLASSPATH=.:$JAVA_HOME/jre/lib:$JAVA_HOME/lib:$JAVA_HOME/lib/tools.jar</p
           postgres user):</para>
 
           <note>
-            <para>This step is not necessary if the Enea uCPE Manager will be
-            using an external database (like MariaDB).</para>
+            <para>This step is not necessary if the Enea Edge Management will
+            be using an external database (like MariaDB).</para>
           </note>
 
           <programlisting>yum remove postgres\*
@@ -356,10 +356,10 @@ userdel postgres</programlisting>
         </listitem>
 
         <listitem>
-          <para>Follow the installation steps for the Enea uCPE Manager
+          <para>Follow the installation steps for the Enea Edge Management
           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"
+          targetptr="install_ucpe_mg">Installing the Enea Edge Management 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>
@@ -377,7 +377,7 @@ userdel postgres</programlisting>
       <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>
+      configuration within the Web-installer.</para>
 
       <para>A common way is to allocate the left ports to WANs and the right
       ports to LANs. At least one port must be allocated to WAN and one to
@@ -388,8 +388,8 @@ userdel postgres</programlisting>
       <title>Determining the Device ID</title>
 
       <para>Each uCPE device needs a unique identifier. This identifier is
-      used to match the registration in the Enea uCPE Manager and the offline
-      configuration of the uCPE device during ZTP (Zero Touch
+      used to match the registration in the Enea Edge Management and the
+      offline configuration of the uCPE device during ZTP (Zero Touch
       Provisioning).</para>
 
       <para>Select a text string to represent the uCPE device, e.g.
@@ -404,7 +404,7 @@ userdel postgres</programlisting>
       <title>Configuring the BIOS</title>
 
       <para>The factory configuration of the BIOS may not match the
-      requirements of Enea NFV Access. The BIOS configuration needs to be
+      requirements of Enea Edge Runtime. The BIOS configuration needs to be
       reviewed and potentially reconfigured to prepare for a successful
       installation.</para>
 
@@ -434,8 +434,8 @@ 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
-      the uCPE device.</para>
+      installation and execution of the Enea Edge Runtime on the uCPE
+      device.</para>
 
       <para>The following boot order is recommended for a base
       configuration:</para>
@@ -459,21 +459,23 @@ userdel postgres</programlisting>
     <title>Preparing the Deployment</title>
 
     <section id="install_ucpe_mg">
-      <title>Installing the Enea uCPE Manager</title>
+      <title>Installing the Enea Edge Management</title>
 
-      <para>The Enea uCPE Manager can be installed using a fresh (first-time)
-      configuration or using a backup file of a previous installation, created
-      within the Enea uCPE Manager GUI.</para>
+      <para>The Enea Edge Management can be installed using a fresh
+      (first-time) configuration or using a backup file of a previous
+      installation, created within the Enea Edge Management GUI.</para>
 
       <section id="fresh_ucpemg_install">
-        <title>Fresh Installation of the Enea uCPE Manager</title>
+        <title>Fresh Installation of the Enea Edge Management</title>
 
         <para>On the CentOS 7 server open a terminal, log into a bash shell
         with the root account and perform the following:</para>
 
         <orderedlist>
           <listitem>
-            <para>Extract <literal>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
+
+            <para>Extract
+            <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
 
             <para>The directory in which the archive has been unpacked will be
             denoted as: <literal>&lt;uCPEM-installdir&gt;</literal>.</para>
@@ -509,8 +511,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 Enea uCPE
-              Manager.</para>
+              provided when upgrading or uninstalling the Enea Edge
+              Management.</para>
             </note>
 
             <itemizedlist>
@@ -589,13 +591,13 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
               </listitem>
 
               <listitem>
-                <para>Heap Configuration: <literal>Please enter the new Maximum Heap 
-                  Size [4g]</literal>:</para>
+                <para>Heap Configuration: <literal>Please enter the new
+                Maximum Heap Size [4g]</literal>:</para>
               </listitem>
 
               <listitem>
-                <para>Create the self-signed certificate: 
-                  <literal>Specify IP or domain name:</literal></para>
+                <para>Create the self-signed certificate: <literal>Specify IP
+                or domain name:</literal></para>
 
                 <note>
                   <para>The certificate can be generated again by running the
@@ -618,8 +620,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
               </listitem>
 
               <listitem>
-                <para>Install the Enea uCPE Manager as a service with the name
-                <literal>ucpemanager</literal>.</para>
+                <para>Install the Enea Edge Management as a service with the
+                name <literal>ucpemanager</literal>.</para>
               </listitem>
 
               <listitem>
@@ -630,8 +632,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
           <listitem>
             <para>Using the IPv4 address of the CentOS 7 Server in a web
-            browser, running on the laptop, log into the Enea uCPE Manager GUI
-            using the default username and password:
+            browser, running on the laptop, log into the Enea Edge Management
+            GUI using the default username and password:
             <literal>admin/admin</literal>.</para>
           </listitem>
         </orderedlist>
@@ -644,47 +646,48 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
           <para>If the CentOS 7 Server is installed behind NAT, the IPv4
           address used will be the public IP of the NAT device and port
           forwarding rules must be created to ensure the uCPE device can
-          access the Enea uCPE Manager. For more details, please see <link
+          access the Enea Edge Management. For more details, please see <link
           linkend="firewall_config">Firewall Configuration</link>.</para>
         </note>
       </section>
 
       <section id="install_ucpemg_from_backup">
-        <title>Installation of the Enea uCPE Manager using a System
+        <title>Installation of the Enea Edge Management using a System
         Back-up</title>
 
-        <para>The Enea uCPE Manager can be restored if a backup file has been
-        previously created.</para>
+        <para>The Enea Edge Management can be restored if a backup file has
+        been previously created.</para>
 
         <para>A backup file can be created by accessing the <emphasis
         role="bold">System</emphasis> menu, and clicking <emphasis
-        role="bold">System Backup</emphasis>, from the Enea uCPE Manager GUI.
-        The resulting zip archive will be located in the
+        role="bold">System Backup</emphasis>, from the Enea Edge Management
+        GUI. The resulting zip archive will be located in the
         <filename>/opt/ems/ucpemanager/application/backup</filename> 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 Enea uCPE Manager installation folder for future
-        use.</para>
+        location outside the Enea Edge Management installation folder for
+        future use.</para>
 
         <note>
-          <para>The System Back-up file obtained from the Enea uCPE Manager
+          <para>The System Back-up file obtained from the Enea Edge Management
           GUI (<filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename>) is
-          different from the snapshot obtained during a Enea uCPE Manager
+          different from the snapshot obtained during a Enea Edge Management
           Upgrade or Uninstall operation
           (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
-          for recovery of the Enea uCPE Manager. For more details, see <olink
-          targetdoc="book_enea_nfv_access_getting_started"
-          targetptr="restore_prev_ucpe_install">Restoring a previous uCPE
-          Manager installation in the <xi:include
+          for recovery of the Enea Edge Management. For more details, see
+          <olink targetdoc="book_enea_nfv_access_getting_started"
+          targetptr="restore_prev_ucpe_install">Restoring a previous Enea Edge
+          Management 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>To install the Enea uCPE Manager with the restore option provide
-        an additional argument as shown below during installation:</para>
+        <para>To install the Enea Edge Management with the restore option
+        provide 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 \
@@ -693,11 +696,11 @@ SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
     </section>
 
     <section id="prep_usb_ena">
-      <title>Preparing the USB stick for installation of the Enea NFV Access
-      Runtime Platform</title>
+      <title>Preparing the USB stick for installation of the Enea Edge
+      Runtime</title>
 
-      <para>To install the Enea NFV Access Runtime Platform, create a bootable
-      USB stick with the image you intend to install.</para>
+      <para>To install the Enea Edge Runtime, create a bootable USB stick with
+      the image you intend to install.</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
@@ -705,7 +708,7 @@ SystemBackup_MMMDD_YYYY_HHMM_SS.zip</programlisting>
 
       <note>
         <para>The <filename>.hddimg</filename> image is available in the
-        <filename>Enea_NFV_Access_Run_Time_Platform_
+        <filename>Enea_Edge_Runtime_Platform_
         &lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
         file you downloaded with your release.</para>
       </note>
@@ -759,16 +762,16 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       </figure>
 
       <para>While the uCPE device is powered off, in order to install and
-      configure the Enea NFV Access Runtime Platform (using the prepared USB
-      stick), connect the laptop to a uCPE device LAN port. For this purpose,
-      a Layer 2 switch or direct cable connection can be used.</para>
+      configure the Enea Edge Runtime (using the prepared USB stick), connect
+      the laptop to a uCPE device LAN port. For this purpose, a Layer 2 switch
+      or direct cable connection can be used.</para>
     </section>
 
     <section id="install_ena_device">
-      <title>Installing Enea NFV Access - uCPE Device Installation</title>
+      <title>Installing Enea Edge - uCPE Device Installation</title>
 
-      <para>To initiate the installation of the Enea NFV Access Runtime
-      Platform do the following:</para>
+      <para>To initiate the installation of the Enea Edge Runtime do the
+      following:</para>
 
       <orderedlist>
         <listitem>
@@ -851,24 +854,24 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
         </listitem>
 
         <listitem>
-          <para>On the Enea <emphasis role="bold">uCPE Manager
+          <para>On the Enea <emphasis role="bold">Edge Management
           settings</emphasis> page of the Web-installer, the user must fill
           in:</para>
 
           <itemizedlist>
             <listitem>
-              <para>The static Enea uCPE Manager IP Address or FQDN. This can
-              be either:</para>
+              <para>The static Enea Edge Management IP Address or FQDN. This can be
+              either:</para>
 
               <itemizedlist spacing="compact">
                 <listitem>
-                  <para>The IP address of the Enea uCPE Manager host machine,
-                  if the device can directly access it.</para>
+                  <para>The IP address of the Enea Edge Management host
+                  machine, if the device can directly access it.</para>
                 </listitem>
 
                 <listitem>
-                  <para>The IP address of the NAT device, if the Enea uCPE
-                  Manager host is located behind a NAT. For more details,
+                  <para>The IP address of the NAT device, if the Enea Edge
+                  Management host is located behind a NAT. For more details,
                   please see <link linkend="firewall_config">Firewall
                   Configuration</link>.</para>
                 </listitem>
@@ -889,7 +892,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
               <para>Customer Tags. They are used for Zero Touch Provisioning
               (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 Enea uCPE Manager. A
+              creating an offline configuration in the Enea Edge Management. A
               later addition of customer tags can only be done by reinstalling
               the uCPE devices.</para>
             </listitem>
@@ -909,7 +912,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
           <itemizedlist>
             <listitem>
               <para>Select a WAN interface to use as the management network
-              interface. This interface is used by the Enea uCPE Manager to
+              interface. This interface is used by the Enea Edge Management to
               communicate with the uCPE device.</para>
             </listitem>
 
@@ -922,16 +925,16 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       </orderedlist>
 
       <para>When the user has completed the configuration steps in the
-      Web-installer, Enea NFV Access is installed on the hard drive. At this
+      Web-installer, Enea Edge Runtime is installed on the hard drive. At this
       stage, the user should remove the USB stick and the LAN cable, and
       shutdown the uCPE device. It will be started after necessary
-      configurations are done in the Enea uCPE Manager, as described
+      configurations are done in the Enea Edge Management, as described
       below.</para>
 
       <note>
         <para>If errors are detected during installation, full logs will be
         available on the last page of the Web-installer. Please contact Enea
-        for log analysis. The system is not expected to be usable if errors are 
+        for log analysis. The system is not expected to be usable if errors are
           reported during installation.</para>
 
         <para>If the USB stick was booted in UEFI mode, a UEFI boot entry is
@@ -958,13 +961,13 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
       <itemizedlist>
         <listitem>
-          <para>Network connection between the server running the Enea uCPE
-          Manager and the laptop.</para>
+          <para>Network connection between the server running the Enea Edge
+          Management and the laptop.</para>
         </listitem>
 
         <listitem>
-          <para>Network connection between the server running the Enea uCPE
-          Manager and the uCPE device.</para>
+          <para>Network connection between the server running the Enea Edge
+          Management and the uCPE device.</para>
         </listitem>
       </itemizedlist>
     </section>
@@ -974,14 +977,14 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
     <title>Management of uCPE Devices</title>
 
     <para>When the installation is complete the uCPE device can be managed in
-    the Enea uCPE Manager.</para>
+    the Enea Edge Management.</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 Enea uCPE Manager. To enable it in the Enea uCPE
-      Manager, an offline configuration needs to be registered for Day-0
+      connects to the Enea Edge Management. To enable it in the Enea Edge
+      Management, an offline configuration needs to be registered for Day-0
       configuration.</para>
 
       <note>
@@ -995,8 +998,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
       <para>The offline configuration consists of data and parameters that are
       meant to be automatically set when a uCPE device connects to the Enea
-      uCPE Manager for the first time. The configuration is typically focused
-      on setting up the network management of the uCPE device, e.g.
+      Edge Management for the first time. The configuration is typically
+      focused on setting up the network management of the uCPE device, e.g.
       configuring network interfaces, WAN and LAN networking and service
       chains.</para>
 
@@ -1008,14 +1011,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 the Enea uCPE Manager, informing the user that the
-        ZTP setup failed for the uCPE device.</para>
+        tries to connect to the Enea Edge Management, 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 Enea uCPE Manager, open <emphasis
+            <para>In a browser access the Enea Edge Management, open <emphasis
             role="bold">Applications</emphasis> and select <emphasis
             role="bold">Offline Config</emphasis>.</para>
           </listitem>
@@ -1029,7 +1032,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
             <para>The name is user defined and can be set to any unique text
             string identifying the configuration. The
-            <literal>deviceVersion</literal> must match the Enea NFV Access
+            <literal>deviceVersion</literal> must match the Enea Edge Runtime
             version of the uCPE device and the <literal>deviceId</literal>
             must be the previously set identifier of the uCPE device
             (DeviceId).</para>
@@ -1042,8 +1045,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
       <para>In order to enroll a uCPE device in the management system and
       establish a management connection, the user will add uCPE device
-      information in the Enea uCPE Manager. This is accomplished by going to
-      <emphasis role="bold">Devices</emphasis>, selecting <emphasis
+      information in the Enea Edge Management. This is accomplished by going
+      to <emphasis role="bold">Devices</emphasis>, selecting <emphasis
       role="bold">Manage</emphasis> and then clicking the <emphasis
       role="bold">Add</emphasis> button.</para>
 
@@ -1057,7 +1060,7 @@ 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 Enea uCPE Manager.
+          uCPE device is referred to in the Enea Edge Management.
           (Mandatory).</para>
         </listitem>
 
@@ -1101,8 +1104,8 @@ 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 Enea uCPE Manager and a
-      uCPE device is already registered with a matching <literal>Device
+      <para>When connectivity is established with the Enea Edge Management and
+      a uCPE device is already registered with a matching <literal>Device
       ID</literal>, the installation is complete, and the connection is
       established.</para>
 
@@ -1113,12 +1116,13 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
 
       <para>In case of management connection failure (e.g. due to a
       misconfiguration), the uCPE device status will be seen as RED
-      (disconnected) in the Enea uCPE Manager. The uCPE device configuration
-      can be corrected by removing the WAN cable(s), reconnecting the laptop
-      to the LAN interface of the uCPE device and rebooting it. At this point,
-      the Web-installer can be accessed from the laptop as described in <olink
+      (disconnected) in the Enea Edge Management. The uCPE device
+      configuration can be corrected by removing the WAN cable(s),
+      reconnecting the laptop to the LAN interface of the uCPE device and
+      rebooting 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
+      targetptr="install_ena_device">Installing Enea Edge - uCPE Device
       installation in the <xi:include
       href="../../s_docbuild/olinkdb/pardoc-names.xml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -1130,14 +1134,15 @@ 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 Enea uCPE Manager, it is
+    <para>Once the uCPE device is connected to the Enea Edge Management, it is
     ready for central management. Two important functions available in the
-    Enea uCPE Manager GUI are alarm checking and resource allocation.</para>
+    Enea Edge Management GUI are alarm checking and resource
+    allocation.</para>
 
     <section id="check_alarms">
       <title>Checking Alarms</title>
 
-      <para>The Enea uCPE Manager dashboard presents alarms in a specific
+      <para>The Enea Edge Management dashboard presents alarms in a specific
       window on the front page.</para>
 
       <para>An alarm can be easily triggered by disconnecting and reconnecting
@@ -1146,15 +1151,15 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       Disconnected::Critical</literal>.</para>
 
       <para>A separate Alarm Management window can be accessed from the Enea
-      uCPE Manager menu for in-depth access and programming of Alarms and
+      Edge Management 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 Enea uCPE Manager it is
-      of interest to check the amount of hardware resources in use.</para>
+      <para>When the uCPE device is connected to the Enea Edge Management it
+      is 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 go to the <emphasis role="bold">Virtual Machines</emphasis>
@@ -1172,9 +1177,9 @@ of=/dev/sdb bs=4M conv=fsync</programlisting>
       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>
+      <para>This 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 device was installed behind a NAT device, the
diff --git a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml b/doc/book-enea-edge-getting-started/doc/introduction.xml
index dedfe37..8186ff1 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
+++ b/doc/book-enea-edge-getting-started/doc/introduction.xml
@@ -4,12 +4,12 @@
 <chapter id="intro_ucpe">
   <title>Overview</title>
 
-  <para>This document describes the Enea NFV Access and provides installation
+  <para>This document describes the Enea Edge and provides installation
   steps for deploying a base configuration in order to create:</para>
 
   <itemizedlist>
     <listitem>
-      <para>A functional uCPE Management installation ready to manage uCPE
+      <para>A functional Enea Edge Management installation ready to manage uCPE
       devices.</para>
     </listitem>
 
@@ -23,32 +23,33 @@
   following chapters.</para>
 
   <section id="ena_solution">
-    <title>Enea NFV Access</title>
+    <title>Enea Edge</title>
 
-    <para>Enea NFV Access for universal Customer Premise Equipment (uCPE) is a
+    <para>Enea Edge for universal Customer Premise Equipment (uCPE) is a
     virtualization and management platform, which allows end-users to onboard,
     instantiate, and run third-party VNFs onto their systems. It is comprised
     of two major components working in close cooperation:</para>
 
     <itemizedlist>
       <listitem>
-        <para>The Enea NFV Access Runtime Platform, which acts as the host
+        <para>The Enea Edge Runtime, which acts as the host
         for Virtualized Network Functions (VNFs) and provides management over
         NETCONF.</para>
       </listitem>
 
       <listitem>
-        <para>The Enea uCPE Manager, a solution that runs on an external
+        <para>The Enea Edge Management, a solution that runs on an external
         server, used for VNF Management and managing large numbers of uCPE
         devices.</para>
       </listitem>
     </itemizedlist>
 
-    <para>In addition, Enea NFV Access also includes a software framework for
-    Automation and Testing (AFTH). More information can be found in the 
+
+    <para>In addition, Enea Edge includes a framework for
+    automation and testing. More information can be found in
     <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
     xmlns:xi="http://www.w3.org/2001/XInclude"
-    xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" />.</para>
+    xpointer="element(book_enea_nfv_access_auto_fw_user_guide/1)" />.</para>
 
     <para>Details concerning release content, including documentation
     structure, are provided in the <xi:include
@@ -58,9 +59,9 @@
     with your release.</para>
 
     <section id="nfv_access">
-      <title>Enea NFV Access Runtime Platform</title>
+      <title>Enea Edge Runtime</title>
 
-      <para>Enea NFV Access Runtime Platform is a lightweight,
+      <para>Enea Edge Runtime is a lightweight,
       multi-architecture virtualization platform built on de-facto standards
       in an SDN/NFV ecosystem. It is designed for a high networking
       performance with minimal hardware footprint, by only providing relevant
@@ -87,19 +88,19 @@
     </section>
 
     <section id="ucpe_manager">
-      <title>Enea uCPE Manager</title>
+      <title>Enea Edge Management</title>
 
-      <para>The Enea uCPE Manager is centralized control system providing
+      <para>The Enea Edge Management is centralized control system providing
       uCPEs domain management capabilities through a GUI and REST API. It can
       be deployed on a host or a virtual machine running 64-bit CentOS 7 on an
-      x86 platform. The Enea uCPE Manager uses a southbound NETCONF protocol
+      x86 platform. The Enea Edge Management uses a southbound NETCONF protocol
       to connect and manage uCPE devices.</para>
 
-      <para>The Enea uCPE Manager provides the following key features:</para>
+      <para>The Enea Edge Management provides the following key features:</para>
 
       <itemizedlist>
         <listitem>
-          <para>Enea NFV Access Runtime Platform Software Management</para>
+          <para>Enea Edge Runtime Software Management</para>
         </listitem>
 
         <listitem>
@@ -141,21 +142,21 @@
 
           <tbody>
             <row>
-              <entry>Enea NFV Access</entry>
+              <entry>Enea Edge</entry>
 
-              <entry>The Enea NFV Access Runtime Platform and the Enea uCPE
-              Manager.</entry>
+              <entry>The Enea Edge Runtime and the Enea Edge
+              Management.</entry>
             </row>
 
             <row>
-              <entry>Enea NFV Access Runtime Platform</entry>
+              <entry>Enea Edge Runtime</entry>
 
               <entry>A lightweight, multi-architecture virtualization
               platform, supporting Virtual Machines.</entry>
             </row>
 
             <row>
-              <entry>Enea uCPE Manager</entry>
+              <entry>Enea Edge Management</entry>
 
               <entry>Enea Universal Customer Premises Equipment
               Manager.</entry>
@@ -164,8 +165,8 @@
             <row>
               <entry>uCPE device</entry>
 
-              <entry>A whitebox running the Enea NFV Access Runtime
-              Platform.</entry>
+              <entry>A whitebox running the Enea Edge
+              Runtime.</entry>
             </row>
           </tbody>
         </tgroup>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml b/doc/book-enea-edge-getting-started/doc/log_collector.xml
index 1b415a2..baa1340 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/log_collector.xml
+++ b/doc/book-enea-edge-getting-started/doc/log_collector.xml
@@ -4,13 +4,13 @@
 
   <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 the Enea
-  uCPE Manager. The following information describes how the log collection
+  Edge Management. The following information describes how the log collection
   mechanism works.</para>
 
   <section id="log_collect_ucpem">
-    <title>Log collecting using the Enea uCPE Manager</title>
+    <title>Log collecting using the Enea Edge Management</title>
 
-    <para>The Enea uCPE Manager allows for collecting a set of logs and state
+    <para>The Enea Edge Management allows for collecting a set of logs and state
     information from a uCPE device.</para>
 
     <section id="log_collect">
@@ -53,7 +53,7 @@
       <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 Enea uCPE Manager. This can be viewed in the
+        the uCPE device to the Enea Edge Management. This can be viewed in the
         GUI in the <emphasis role="bold">Faults</emphasis> menu, after selecting 
 <emphasis role="bold">Events</emphasis>.</para>
 
@@ -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
-      Enea uCPE Manager.</para>
+      Enea Edge Management.</para>
 
       <orderedlist>
         <listitem>
@@ -124,8 +124,8 @@
 
         <listitem>
           <para>In the <emphasis role="bold">Device File Listing</emphasis> table, select
-          the archive you want to download from the uCPE device to Enea uCPE
-          Manager.</para>
+          the archive you want to download from the uCPE device to Enea Edge
+          Management.</para>
         </listitem>
 
         <listitem>
@@ -133,7 +133,7 @@
           button.</para>
 
           <para>The archive will be downloaded from the uCPE device and stored
-          on the Enea uCPE Manager.</para>
+          on the Enea Edge Management.</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 Enea uCPE Manager to
+      <para>This option downloads a logs archive from the Enea Edge Management to
       a local (user) machine for analysis. The archive must first be available
-      in the Enea uCPE Manager in order to be downloaded.</para>
+      in the Enea Edge Management in order to be downloaded.</para>
 
       <orderedlist>
         <listitem>
@@ -236,10 +236,10 @@ select <emphasis role="bold">Delete Debug Log Archive</emphasis>.</para>
     </section>
 
     <section id="delete_archives_ucpem">
-      <title>Deleting a Logs Archive from the Enea uCPE Manager</title>
+      <title>Deleting a Logs Archive from the Enea Edge Management</title>
 
-      <para>This option deletes a logs archive from the Enea uCPE
-      Manager.</para>
+      <para>This option deletes a logs archive from the Enea Edge
+      Management.</para>
 
       <orderedlist>
         <listitem>
@@ -259,13 +259,13 @@ table.</para>
         <listitem>
           <para>Click the <emphasis role="bold">Delete</emphasis> button.</para>
 
-          <para>The file will be deleted from the Enea uCPE Manager and the
+          <para>The file will be deleted from the Enea Edge Management and the
           table will be updated.</para>
         </listitem>
       </orderedlist>
 
       <note>
-        <para>Deleting the logs file from the Enea uCPE Manager does not
+        <para>Deleting the logs file from the Enea Edge Management does not
         affect the file located on the uCPE device.</para>
       </note>
     </section>
@@ -274,7 +274,7 @@ table.</para>
       <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 Enea uCPE Manager, the appropriate permissions
+      debug-log files from the Enea Edge Management, the appropriate permissions
       must be changed:</para>
 
       <orderedlist>
@@ -320,19 +320,19 @@ then select <emphasis role="bold">Configuration</emphasis>.</para>
     </section>
 
     <section id="download_ucpemg_logs">
-      <title>Downloading Enea uCPE Manager Logs</title>
+      <title>Downloading Enea Edge Management Logs</title>
 
-      <para>Often, sending the Enea uCPE Manager logs together with collected
+      <para>Often, sending the Enea Edge Management logs together with collected
       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>Enea uCPE Manager log files are located in
-      <filename>application/logs/</filename> in the Enea uCPE Manager's
+      <para>Enea Edge Management log files are located in
+      <filename>application/logs/</filename> in the Enea Edge Management'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
-      Enea uCPE Manager GUI by performing the following:</para>
+      Enea Edge Management GUI by performing the following:</para>
 
       <orderedlist>
         <listitem>
@@ -372,10 +372,10 @@ then select <emphasis role="bold">Configuration</emphasis>.</para>
   </section>
 
   <section id="log_collect_no_ucpem">
-    <title>Log collecting without using the Enea uCPE Manager</title>
+    <title>Log collecting without using the Enea Edge Management</title>
 
     <para>Log collection from uCPE Devices can also be done when there is no
-    Enea uCPE Manager connection. A SSH connection to uCPE Device is needed
+    Enea Edge Management connection. A SSH connection to uCPE Device is needed
     for use of the log collector script, which can be found in the uCPE Device
     file system in <literal>/usr/local/enea/</literal>.</para>
 
diff --git a/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml b/doc/book-enea-edge-getting-started/doc/net_config_options.xml
index cfffb1a..dae5b36 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml
+++ b/doc/book-enea-edge-getting-started/doc/net_config_options.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="net_config_operations">
   <title>Network Configuration Options</title>
 
   <para>Various Advanced Network Configuration options can be done from Enea
-  uCPE Manager GUI.</para>
+  Edge Management 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 Enea uCPE Manager, from the uCPE device.
-    The Device Call Home option is required when deploying a uCPE device
-    behind NAT since the IP address of the uCPE device is hidden for the Enea
-    uCPE Manager.</para>
+    between the uCPE Device and the Enea Edge Management, from the uCPE
+    device. The Device Call Home option is required when deploying a uCPE
+    device behind NAT since the IP address of the uCPE device is hidden for
+    the Enea Edge Management.</para>
 
     <para>Enable Device Call Home by marking the Device Call Home checkbox
-    when registering the uCPE device in Enea uCPE Manager. When using this
-    mechanism, the device will initiate a connection to the Enea uCPE Manager
-    for NETCONF traffic (over SSH), while the Enea uCPE Manager waits for a
-    device connection.</para>
+    when registering the uCPE device in Enea Edge Management. When using this
+    mechanism, the device will initiate a connection to the Enea Edge
+    Management for NETCONF traffic (over SSH), while the Enea Edge Management
+    waits for a device connection.</para>
   </section>
 
   <section id="device_net_config">
@@ -90,7 +90,7 @@
       virtualization infrastructure and VNFs, they must be configured into the
       management system.</para>
 
-      <para>To add an interface into the Enea uCPE Manager, select the uCPE
+      <para>To add an interface into the Enea Edge Management, select the uCPE
       device, then from the top toolbar select <emphasis
       role="bold">Configuration</emphasis>, then <emphasis
       role="bold">External Interfaces</emphasis>, <emphasis
@@ -191,7 +191,7 @@
         <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
+        device are automatically added in the Enea Edge Management 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>
@@ -207,12 +207,13 @@
 
         <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 <emphasis role="bold">Configuration</emphasis> menu, then
-            <emphasis role="bold">External Interfaces</emphasis> and <emphasis
-            role="bold">Configuration</emphasis>. The already configured
-            interfaces are displayed here, as seen in the figure above.</para>
+            <para>To edit an interface configuration type from the Enea Edge
+            Management, select the uCPE device, then from the top toolbar
+            select the <emphasis role="bold">Configuration</emphasis> menu,
+            then <emphasis role="bold">External Interfaces</emphasis> and
+            <emphasis role="bold">Configuration</emphasis>. The already
+            configured interfaces are displayed here, as seen in the figure
+            above.</para>
           </listitem>
 
           <listitem>
@@ -259,11 +260,11 @@
 
         <orderedlist>
           <listitem>
-            <para>To edit an interface configuration from the Enea uCPE
-            Manager, select the uCPE device, then from the top toolbar select
-            the <emphasis role="bold">Configuration</emphasis> menu then
-            <emphasis role="bold">External Interfaces</emphasis> and select
-            <emphasis role="bold">Configuration</emphasis>. The already
+            <para>To edit an interface configuration from the Enea Edge
+            Management, select the uCPE device, then from the top toolbar
+            select the <emphasis role="bold">Configuration</emphasis> menu
+            then <emphasis role="bold">External Interfaces</emphasis> and
+            select <emphasis role="bold">Configuration</emphasis>. The already
             configured interfaces will be displayed here.</para>
           </listitem>
 
@@ -304,9 +305,9 @@
         <note>
           <para>Correct <emphasis role="bold">Country Code</emphasis>
           selection is mandatory. All configuration options are available in
-          the Enea uCPE Manager GUI but only the Radio Settings that conform
-          with the selected country's official regulatory laws will be applied
-          when the Wireless AP is started on the uCPE Device.</para>
+          the Enea Edge Management GUI but only the Radio Settings that
+          conform with the selected country's official regulatory laws will be
+          applied when the Wireless AP is started on the uCPE Device.</para>
         </note>
       </section>
 
@@ -319,8 +320,8 @@
         role="bold">External Interfaces</emphasis>, where a list of available
         network interfaces and their capabilities can be found.</para>
 
-        <para>After networking interfaces have been added to the Enea uCPE
-        Manager, the user can change the interface type (DPDK, SR-IOV,
+        <para>After networking interfaces have been added to the Enea Edge
+        Management, the user can change the interface type (DPDK, SR-IOV,
         Standard, WAN, WAP).</para>
 
         <figure>
@@ -339,8 +340,8 @@
     <section id="configure_bridges">
       <title>Configuring Bridges</title>
 
-      <para>After networking interfaces have been added to the Enea uCPE
-      Manager, the user can create the necessary OVS bridges.</para>
+      <para>After networking interfaces have been added to the Enea Edge
+      Management, the user can create the necessary OVS bridges.</para>
 
       <figure>
         <title>OVS Bridges</title>
@@ -353,8 +354,8 @@
         </mediaobject>
       </figure>
 
-      <para><emphasis role="bold">How to add OVS bridges in the Enea uCPE
-      Manager</emphasis></para>
+      <para><emphasis role="bold">How to add OVS bridges in the Enea Edge
+      Management</emphasis></para>
 
       <orderedlist>
         <listitem>
@@ -428,7 +429,7 @@
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">Device management</emphasis>. Part of
-            the device configuration done by the Enea uCPE Manager.</para>
+            the device configuration done by the Enea Edge Management.</para>
           </listitem>
 
           <listitem>
@@ -537,7 +538,7 @@
     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
+    Edge Management to setup the virtualization infrastructure on the uCPE
     device, as soon as a device enrolls into the management system.</para>
 
     <section id="offline_configuration">
@@ -551,12 +552,12 @@
 
       <para>Alternatively, a wildcard can be used in the <literal>Device
       ID</literal> field, which results in a configuration being pushed on all
-      uCPE devices upon their initial connection towards the Enea uCPE
-      Manager.</para>
+      uCPE devices upon their initial connection towards the Enea Edge
+      Management.</para>
 
       <para>If the offline configuration is not configured for a uCPE device,
       an alarm will be raised: <literal>Day-0 Config:ZTP:Major</literal>,
-      which occurs when the uCPE device connects to the Enea uCPE Manager
+      which occurs when the uCPE device connects to the Enea Edge Management
       informing that the ZTP setup failed for the specific uCPE device.</para>
 
       <para>To create an offline configuration, select from the top toolbar
@@ -598,10 +599,10 @@
 
       <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>
+      Edge 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
+      <para>When a device connects to the Enea Edge Management 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>
@@ -632,7 +633,7 @@
 
       <note>
         <para>The ZTP will only be triggered the first time a uCPE device
-        connects to the Enea uCPE Manager. Just changing an offline
+        connects to the Enea Edge Management. 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. Select
@@ -654,29 +655,29 @@
     <section id="upload_scripts">
       <title>Uploading Scripts</title>
 
-      <para>The scripts need to be uploaded to the Enea uCPE Manager prior to
-      use. When uploading scripts to the Enea uCPE Manager make sure to select
-      the right script type.</para>
+      <para>The scripts need to be uploaded to the Enea Edge Management prior
+      to use. When uploading scripts to the Enea Edge Management make sure to
+      select the right script type.</para>
 
       <para>The following script types are supported:</para>
 
       <itemizedlist>
         <listitem>
-          <para><literal>Once-before-startup</literal>. This script will only 
-            execute once after the system has rebooted, prior to processing any 
-            device configuration.</para>
+          <para><literal>Once-before-startup</literal>. This script will only
+          execute once after the system has rebooted, prior to processing any
+          device configuration.</para>
         </listitem>
 
         <listitem>
-          <para><literal>Always-before-startup</literal>. This script will always 
-            execute after the system has rebooted, prior to processing any device 
-            configuration.</para>
+          <para><literal>Always-before-startup</literal>. This script will
+          always execute after the system has rebooted, prior to processing
+          any device configuration.</para>
         </listitem>
 
         <listitem>
-          <para><literal>Once-after-startup</literal>. The script will always 
-            execute after the system has rebooted, after all device configuration 
-            processes have completed.</para>
+          <para><literal>Once-after-startup</literal>. The script will always
+          execute after the system has rebooted, after all device
+          configuration processes have completed.</para>
         </listitem>
 
         <listitem>
@@ -734,7 +735,7 @@
           <para>Select the script you want to delete from the <emphasis
           role="bold">Uploaded Scripts</emphasis> tab and then click <emphasis
           role="bold">Delete</emphasis>, which will remove the script
-          immediately from the Enea uCPE Manager.</para>
+          immediately from the Enea Edge Management.</para>
         </listitem>
       </orderedlist>
     </section>
@@ -742,8 +743,8 @@
     <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>
+      <para>The location where the scripts are staged in the Enea Edge
+      Management can be chanaged as described below:</para>
 
       <orderedlist>
         <listitem>
@@ -754,7 +755,7 @@
 
         <listitem>
           <para>Select the <emphasis role="bold">Configuration</emphasis> tab
-          and specify a new loacation to store the scripts.</para>
+          and specify a new location to store the scripts.</para>
 
           <note>
             <para>Change the script storage location only if you have many
@@ -815,12 +816,12 @@
     </section>
   </section>
 
-  <section>
+  <section  id="wireless_access_point">
     <title>Wireless Access Point</title>
 
-    <para>The Wireless AP Screen from the Enea uCPE Manager Configuration menu
-    allows users to configure a <literal>Wireless Access Point</literal>. A
-    <literal>wap-capable</literal> interface and a LAN bridge must be added
+    <para>The Wireless AP Screen from the Enea Edge Management Configuration
+    menu allows users to configure a <literal>Wireless Access Point</literal>.
+    A <literal>wap-capable</literal> interface and a LAN bridge must be added
     before doing the Wireless AP configuration. For more details see sections
     <link linkend="wap_interface_type">Wap interface Type</link> and <link
     linkend="dataplane_bridge">Data-plane bridge</link>.</para>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
index f416f8f..4984a35 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
@@ -2,19 +2,19 @@
 <chapter id="troubleshooting">
   <title>Troubleshooting and Recovery</title>
 
-  <para>In all scenarios where possible, collect the logs for
-    debugging. More information on log collecting can be found in
-  <olink targetdoc="book_enea_nfv_access_getting_started"
+  <para>In all scenarios where possible, collect the logs for debugging. More
+  information on log collecting can 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>The following is a small list of possible Enea NFV Access problems,
-  and their solutions. 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"
+  <para>The following is a small list of possible Enea Edge problems, and
+  their solutions. If you encounter other issues or can't get Enea Edge 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
   <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -29,7 +29,7 @@
 
       <thead>
         <row>
-          <entry align="center">Enea NFV Access Problem</entry>
+          <entry align="center">Enea Edge Problem</entry>
 
           <entry align="center">Solution</entry>
         </row>
@@ -37,11 +37,11 @@
 
       <tbody>
         <row>
-          <entry>A uCPE device fails to connect to the Enea uCPE Manager after
-          installation.</entry>
+          <entry>A uCPE device fails to connect to the Enea Edge Management
+          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
+          <entry>If the uCPE device is not able to connect to the Enea Edge
+          Management 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"
@@ -59,7 +59,7 @@
           <entry><orderedlist>
               <listitem>
                 <para>Perform a hardware reboot of the uCPE Device and select
-                the previous Enea NFV Access image from the GRUB menu. This
+                the previous Enea Edge Runtime image from the GRUB menu. This
                 action assumes physical access to the uCPE device.</para>
               </listitem>
 
@@ -77,14 +77,14 @@
         </row>
 
         <row>
-          <entry>After a failed uCPE device upgrade the previous Enea NFV
-          Access image (from the GRUB menu) does not boot.</entry>
+          <entry>After a failed uCPE device upgrade the previous Enea Edge
+          image (from the GRUB menu) does not boot.</entry>
 
-          <entry>Reinstall Enea NFV Access on the uCPE device and redeploy the
+          <entry>Reinstall Enea Edge 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
-          Device installation in the <xi:include
+          targetptr="install_ena_device">Installing Enea Edge - 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>
@@ -92,8 +92,8 @@
         </row>
 
         <row>
-          <entry>The Enea uCPE Manager upgrade fails and a working snapshot is
-          available.</entry>
+          <entry>The Enea Edge Management upgrade fails and a working snapshot
+          is available.</entry>
 
           <entry>If a working snapshot obtained during a previous Upgrade or
           Uninstall is available
@@ -109,7 +109,7 @@
                 <para>Restore the previous installation as described in <olink
                 targetdoc="book_enea_nfv_access_getting_started"
                 targetptr="restore_prev_ucpe_install">Restoring a previous
-                uCPE Manager installation in the <xi:include
+                Enea Edge Management 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>
@@ -119,8 +119,8 @@
         </row>
 
         <row>
-          <entry>The Enea uCPE Manager upgrade fails and no working snapshot
-          is available, but a System Back-up file exists.</entry>
+          <entry>The Enea Edge Management upgrade fails and no working
+          snapshot is available, but a System Back-up file exists.</entry>
 
           <entry><orderedlist>
               <listitem>
@@ -131,10 +131,10 @@
 
               <listitem>
                 <para>Perform an installation with the restore option of a
-                previous Enea uCPE Manager configuration as described in
+                previous Enea Edge Management configuration as described in
                 <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
+                Enea Edge Management using a System Back-up 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>
@@ -145,7 +145,7 @@
 
         <row>
           <entry>The uCPE device is booted, the ssh connection is available
-          but the device is not connected to the Enea uCPE Manager.</entry>
+          but the device is not connected to the Enea Edge Management.</entry>
 
           <entry><orderedlist>
               <listitem>
@@ -155,7 +155,7 @@
 
               <listitem>
                 <para>Use the <emphasis role="bold">Reconnect</emphasis>
-                button from the Enea uCPE Manager's GUI.</para>
+                button from the Enea Edge Management's GUI.</para>
               </listitem>
 
               <listitem>
@@ -169,8 +169,8 @@
                 <para>If the above actions do not work, reinstall and
                 reconfigure the device using the steps provided in <olink
                 targetdoc="book_enea_nfv_access_getting_started"
-                targetptr="install_ena_device">Installing Enea NFV Access -
-                uCPE Device installation in the <xi:include
+                targetptr="install_ena_device">Installing Enea Edge - 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>
@@ -186,8 +186,8 @@
           <entry>Perform a hardware reboot on the uCPE device. If the problem
           is not fixed, reinstall and reconfigure the device using the steps
           provided in <olink targetdoc="book_enea_nfv_access_getting_started"
-          targetptr="install_ena_device">Installing Enea NFV Access - uCPE
-          Device installation in the <xi:include
+          targetptr="install_ena_device">Installing Enea Edge - 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>
@@ -207,16 +207,16 @@
               <listitem>
                 <para>Reboot the device by accessing <emphasis
                 role="bold">Operations</emphasis> and then selecting <emphasis
-                role="bold">Reboot</emphasis> from within the Enea uCPE
-                Manager.</para>
+                role="bold">Reboot</emphasis> from within the Enea Edge
+                Management.</para>
               </listitem>
 
               <listitem>
                 <para>If the above actions do not work, redeploy all services.
-                This is done by cleaning up the existing configuration by 
-accessing <emphasis role="bold">Operations</emphasis>, then selecting 
-<emphasis role="bold">Factory Reset</emphasis> for a specific device and 
-redeploying the VNF services.</para>
+                This is done by cleaning up the existing configuration by
+                accessing <emphasis role="bold">Operations</emphasis>, then
+                selecting <emphasis role="bold">Factory Reset</emphasis> for a
+                specific device and redeploying the VNF services.</para>
               </listitem>
             </orderedlist></entry>
         </row>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
index eae371e..14ac049 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
@@ -1,26 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="upgrade_ena">
-  <title>Upgrading Enea NFV Access</title>
+  <title>Upgrading Enea Edge</title>
 
   <para>Enea provides regular releases that will require the upgrading of Enea
-  NFV Access components. The Enea uCPE Manager must be upgraded first,
-  followed by upgrading the Enea NFV Access Runtime Platform on the uCPE
-  devices.</para>
+  Edge components. The Enea Edge Management must be upgraded first, followed
+  by upgrading the Enea Edge Runtime on the uCPE devices.</para>
 
   <section id="upgrade_mg">
-    <title>Upgrading the Enea uCPE Manager</title>
+    <title>Upgrading the Enea Edge Management</title>
 
     <note>
       <para>It is recommended to create a system backup by accessing <emphasis
       role="bold">System</emphasis> and selecting <emphasis role="bold">System
-      Backup</emphasis> from the Enea uCPE Manager GUI, for recovery in case
-      of an upgrade failure.</para>
+      Backup</emphasis> from the Enea Edge Management GUI, for recovery in
+      case of an upgrade failure.</para>
     </note>
 
     <orderedlist>
       <listitem>
         <para>Extract the
-        <filename>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
+        <filename>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
         folder.</para>
 
         <para>The directory in which the archive has been unpacked will be
@@ -33,8 +32,8 @@
 
       <listitem>
         <para>Run the following command with the root account and change
-        <literal>/opt/ems</literal> to the correct location of the Enea uCPE
-        Manager installation:</para>
+        <literal>/opt/ems</literal> to the correct location of the Enea Edge
+        Management installation:</para>
 
         <programlisting>./upgrade.sh /opt/ems \
 Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programlisting>
@@ -58,7 +57,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 Enea uCPE Manager.</para>
+          restoring the Enea Edge Management.</para>
         </note>
       </listitem>
 
@@ -73,15 +72,16 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
     </itemizedlist>
 
     <para><olink targetdoc="book_enea_nfv_access_getting_started"
-    targetptr="fresh_ucpemg_install">Fresh Installation of the Enea uCPE
-    Manager in the <ns:include
+    targetptr="fresh_ucpemg_install">Fresh Installation of the Enea Edge Management
+    in the <ns:include
     href="../../s_docbuild/olinkdb/pardoc-names.xml"
     xmlns:ns="http://www.w3.org/2001/XInclude"
     xpointer="element(book_enea_nfv_access_getting_started/1)" /></olink>
     Manual contains information about the input required to be entered during
     the execution of the upgrade script.</para>
 
-    <para condition="hidden">For an example on how to upgrade an Enea uCPE Manager installation
+
+    <para condition="hidden">For an example on how to upgrade an Enea Edge Management installation
     in a High Availability setup, consult <olink
     targetdoc="book_enea_nfv_access_getting_started"
     targetptr="ha_upgrade">Upgrading a High Availability Deployment in the
@@ -91,15 +91,15 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
     Manual.</para>
 
     <section id="restore_prev_ucpe_install">
-      <title>Restoring a previous Enea uCPE Manager Installation</title>
+      <title>Restoring a previous Enea Edge Management Installation</title>
 
-      <para><emphasis role="bold">How to restore a previous Enea uCPE Manager
-      installation</emphasis></para>
+      <para><emphasis role="bold">How to restore a previous Enea Edge
+      Management installation</emphasis></para>
 
       <orderedlist>
         <listitem>
           <para>Extract
-          <filename>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename></para>
+          <filename>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename></para>
         </listitem>
 
         <listitem>
@@ -110,9 +110,9 @@ 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 Enea uCPE Manager Upgrade or Enea uCPE
-          Manager Uninstall Operation into the
-          <literal>&lt;uCPEM-installdir&gt;/dist</literal> directory.</para>
+          created during a previous Enea Edge Management Upgrade or Enea Edge
+          Management Uninstall Operation into the
+          <literal>&lt;uCPEM-installdir&gt;</literal> directory.</para>
         </listitem>
 
         <listitem>
@@ -121,8 +121,8 @@ 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 Enea uCPE
-          Manager installation:</para>
+          <literal>/opt/ems</literal> to the correct location of the Enea Edge
+          Management installation:</para>
 
           <programlisting>./restore.sh /opt/ems ucpemanager-Backup-YYYYddMMHHmm.tar.gz</programlisting>
         </listitem>
@@ -137,9 +137,9 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         </listitem>
 
         <listitem>
-          <para>Reinstall the Enea uCPE Manager application on the specified
-          target location, restoring the data in the database and files in the
-          process.</para>
+          <para>Reinstall the Enea Edge Management application on the
+          specified target location, restoring the data in the database and
+          files in the process.</para>
         </listitem>
       </itemizedlist>
 
@@ -148,21 +148,22 @@ 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 Enea uCPE Manager Installation</title>
+      <title>Uninstalling an existing Enea Edge Management
+      Installation</title>
 
-      <para><emphasis role="bold">How to uninstall an existing Enea uCPE
-      Manager installation</emphasis></para>
+      <para><emphasis role="bold">How to uninstall an existing Enea Edge
+      Management installation</emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Navigate to the folder where the Enea uCPE Manager was
-          unpacked: <filename>&lt;uCPEM-installdir&gt;/dist</filename>.</para>
+          <para>Navigate to the folder where the Enea Edge Management is
+          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 Enea uCPE
-          Manager installation:</para>
+          <literal>/opt/ems</literal> to the correct location of the Enea Edge
+          Management installation:</para>
 
           <programlisting>./uninstall.sh /opt/ems</programlisting>
         </listitem>
@@ -185,7 +186,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 Enea uCPE Manager.</para>
+            for restoring Enea Edge Management.</para>
           </note>
         </listitem>
 
@@ -204,7 +205,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         </listitem>
       </itemizedlist>
 
-      <para>After these steps, the Enea uCPE Manager is completely removed
+      <para>After these steps, the Enea Edge Management is completely removed
       from the system.</para>
     </section>
   </section>
@@ -212,7 +213,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
   <section id="upgrade_devices">
     <title>uCPE device Upgrades</title>
 
-    <para>A uCPE device can be upgraded using the Enea uCPE Manager
+    <para>A uCPE device can be upgraded using the Enea Edge Management
     GUI.</para>
 
     <section id="device_up_process">
@@ -282,7 +283,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 the type
         <literal>rootfs.ostree.tar.bz2</literal>, which are available in the
-        <filename>Enea_NFV_Access_Run_Time_Platform_&lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
+        <filename>Enea_Edge_Runtime_&lt;processor&gt;_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</filename>
         file you downloaded with your release.</para>
       </note>
 
@@ -378,7 +379,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 Enea uCPE Manager server
+              <para>The hour represents the local Enea Edge Management server
               hour.</para>
             </note>
           </listitem>
@@ -585,4 +586,4 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
       </section>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml b/doc/book-enea-edge-getting-started/doc/vnf_mg.xml
index 8690818..bd2fb0b 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
+++ b/doc/book-enea-edge-getting-started/doc/vnf_mg.xml
@@ -2,17 +2,17 @@
 <chapter id="vnf_mg">
   <title>VNF Management</title>
 
-  <para>The Enea uCPE Manager is responsible for onboarding, configuring (e.g.
-  CloudInit) and ensuring life cycle management of VNFs that are instantiated
-  and run on the various uCPE devices.</para>
+  <para>The Enea Edge Management is responsible for onboarding, configuring
+  (e.g. CloudInit) and ensuring life cycle management of VNFs that are
+  instantiated and run on the various uCPE devices.</para>
 
   <section id="onboarding_a_vnf">
     <title>Onboarding a VNF</title>
 
-    <para>The onboarding of a VNF means adding it to the Enea uCPE Manager VNF
-    Catalogue and preparing it for instantiation (deployment on connected uCPE
-    devices). This is accomplished using the Enea uCPE Manager Onboarding
-    graphical user interface.</para>
+    <para>The onboarding of a VNF means adding it to the Enea Edge Management
+    VNF Catalogue and preparing it for instantiation (deployment on connected
+    uCPE devices). This is accomplished using the Enea Edge Management
+    Onboarding graphical user interface.</para>
 
     <para>Typically, the Getting Started Guide of a VNF, provided by the VNF
     vendor, contains all necessary information needed to onboard a VNF.</para>
@@ -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 Enea uCPE Manager is
-            the adding of a license during the Cloud-Init setup.</para>
+            license handling that can be employed in the Enea Edge Management
+            is the adding of a license during the Cloud-Init setup.</para>
           </note>
         </listitem>
 
@@ -109,26 +109,28 @@
     </section>
 
     <section id="onboard_in_ucpemg">
-      <title>Onboarding into the Enea uCPE Manager</title>
+      <title>Onboarding into the Enea Edge Management</title>
 
-      <para><emphasis role="bold">How to onboard a VNF into the Enea uCPE
-      Manager </emphasis></para>
+      <para><emphasis role="bold">How to onboard a VNF into the Enea Edge
+      Management </emphasis></para>
 
       <orderedlist>
         <listitem>
-          <para>Select from the top toolbar <emphasis role="bold">VNF</emphasis> 
-                  and then <emphasis role="bold">Descriptors</emphasis>.</para>
+          <para>Select from the top toolbar <emphasis
+          role="bold">VNF</emphasis> and then <emphasis
+          role="bold">Descriptors</emphasis>.</para>
         </listitem>
 
         <listitem>
-          <para>Click the <emphasis role="bold">On-board</emphasis> button.</para>
+          <para>Click the <emphasis role="bold">On-board</emphasis>
+          button.</para>
         </listitem>
       </orderedlist>
 
       <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 Enea uCPE Manager will create the VNF descriptor and
-      add it to its VNF Catalog.</para>
+      Onboard button, the Enea Edge Management will create the VNF descriptor
+      and add it to its VNF Catalog.</para>
 
       <figure>
         <title>Onboard a VNF</title>
@@ -147,8 +149,8 @@
         <listitem>
           <para><emphasis role="bold">VM Image File</emphasis>. This is the
           Virtual Machine image file for the VNF. Typically, it is a QCOW
-          image. Press <emphasis role="bold">Choose File</emphasis> and select the image you
-          wish to upload.</para>
+          image. Press <emphasis role="bold">Choose File</emphasis> and select
+          the image you wish to upload.</para>
         </listitem>
 
         <listitem>
@@ -165,7 +167,7 @@
         <listitem>
           <para><emphasis role="bold">Description</emphasis>. This field
           contains any description provided and is only displayed in the GUI
-          tables in the Enea uCPE Manager.</para>
+          tables in the Enea Edge Management.</para>
         </listitem>
 
         <listitem>
@@ -197,14 +199,14 @@
 
       <para><emphasis role="bold">Interfaces Tab</emphasis></para>
 
-      <para>Click on the <emphasis role="bold">Interfaces</emphasis> tab to show the
-      Interfaces table.</para>
+      <para>Click on the <emphasis role="bold">Interfaces</emphasis> tab to
+      show the Interfaces table.</para>
 
       <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 Enea uCPE
-      Manager.</para>
+      name, and optionally a description, used only by the Enea Edge
+      Management.</para>
 
       <note>
         <para>CAUTION: The user MUST conserve the same order for the virtual
@@ -213,9 +215,9 @@
 
       <para><emphasis role="bold">Cloud Init Tab</emphasis></para>
 
-      <para>Click the <emphasis role="bold">Cloud Init</emphasis> tab to provide the
-      Cloud-Init configuration. There are three fields that need to be
-      populated:</para>
+      <para>Click the <emphasis role="bold">Cloud Init</emphasis> tab to
+      provide the Cloud-Init configuration. There are three fields that need
+      to be populated:</para>
 
       <orderedlist>
         <listitem>
@@ -267,7 +269,7 @@
           <para>The <literal>Content Files Table</literal> is ONLY used if
           <literal>ConfigDrive</literal> is chosen as the Cloud-Init
           Datasource. For each content file added, a <literal>Path</literal>
-          must be provided. When the Enea uCPE Manager is used to create an
+          must be provided. When the Enea Edge Management 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
@@ -286,9 +288,9 @@
       <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
-      <literal>libvirt/virsh</literal> (running in Enea NFV Access) when
-      creating an instance of the VNF. Consult with the VNF Vendor or ENEA
-      support for values needed by specific VNFs.</para>
+      <literal>libvirt/virsh</literal> (running in Enea Edge) when creating an
+      instance of the VNF. Consult with the VNF Vendor or ENEA support for
+      values needed by specific VNFs.</para>
 
       <para><emphasis role="bold">Property Values</emphasis></para>
 
@@ -343,8 +345,8 @@
 
     <orderedlist>
       <listitem>
-        <para>Select from the top toolbar <emphasis role="bold">VNF</emphasis> and 
-        choose <emphasis role="bold">Instances</emphasis>.</para>
+        <para>Select from the top toolbar <emphasis role="bold">VNF</emphasis>
+        and choose <emphasis role="bold">Instances</emphasis>.</para>
       </listitem>
 
       <listitem>
@@ -400,13 +402,14 @@
       </listitem>
 
       <listitem>
-        <para>Hit the <emphasis role="bold">Create</emphasis> button to deploy the VNF and
-        run it on the specified uCPE device.</para>
+        <para>Hit the <emphasis role="bold">Create</emphasis> button to deploy
+        the VNF and run it on the specified uCPE device.</para>
       </listitem>
     </orderedlist>
 
-    <para>Selecting the <emphasis role="bold">VNF</emphasis> menu then choosing <emphasis role="bold">Events</emphasis> 
-        will show that the VNF was created and a connection was established.</para>
+    <para>Selecting the <emphasis role="bold">VNF</emphasis> menu then
+    choosing <emphasis role="bold">Events</emphasis> will show that the VNF
+    was created and a connection was established.</para>
   </section>
 
   <section id="enter_console">
@@ -419,8 +422,9 @@
 
     <orderedlist>
       <listitem>
-        <para>SSH to the uCPE device from the Enea uCPE Manager
-        (Access the <emphasis role="bold">Device</emphasis> menu and select <emphasis role="bold">SSH</emphasis>) using:</para>
+        <para>SSH to the uCPE device from the Enea Edge Management (Access the
+        <emphasis role="bold">Device</emphasis> menu and select <emphasis
+        role="bold">SSH</emphasis>) using:</para>
 
         <itemizedlist>
           <listitem>
@@ -434,12 +438,13 @@
             <para>For reverse ssh connections (ssh to a uCPE device behind
             NAT): the <literal>Username</literal> (default: root) and the
             <literal>Reverse ssh</literal> checkbox checked. The port will be
-            automatically choosen by the Enea uCPE Manager in the range
-            defined in the <emphasis role="bold">SSH</emphasis> configuration panel, 
-                        available when accessing <emphasis role="bold">System</emphasis>, then 
-                        <emphasis role="bold">Configuration</emphasis> and choosing <emphasis role="bold">Reverse
-            SSH</emphasis> . By default, the start port will
-            be <literal>7000</literal> and the maximum number of ports
+            automatically chosen by the Enea Edge Management in the range
+            defined in the <emphasis role="bold">SSH</emphasis> configuration
+            panel, available when accessing <emphasis
+            role="bold">System</emphasis>, then <emphasis
+            role="bold">Configuration</emphasis> and choosing <emphasis
+            role="bold">Reverse SSH</emphasis> . By default, the start port
+            will be <literal>7000</literal> and the maximum number of ports
             allocated to all devices is 10. Only one port per device is
             allowed.</para>
 
@@ -469,4 +474,4 @@
       </listitem>
     </orderedlist>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-release-info/swcomp.mk b/doc/book-enea-edge-getting-started/swcomp.mk
index 3ba7c8d..41e4416 100644..100755
--- a/doc/book-enea-nfv-access-release-info/swcomp.mk
+++ b/doc/book-enea-edge-getting-started/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-release-info
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Release Information"
+BOOKPACKAGES := book-enea-edge-getting-started
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Getting Started"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-telemetry-open-source/doc/README b/doc/book-enea-edge-management-open-source/doc/README
index 1077acb..1077acb 100644
--- a/doc/book-enea-nfv-access-telemetry-open-source/doc/README
+++ b/doc/book-enea-edge-management-open-source/doc/README
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/doc/about.xml b/doc/book-enea-edge-management-open-source/doc/about.xml
index d443886..05cea19 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/doc/about.xml
+++ b/doc/book-enea-edge-management-open-source/doc/about.xml
@@ -5,7 +5,7 @@
   <title>About this Report</title>
 
   <para>This document contains the open source and license information
-  pertaining to packages provided with Enea NFV Access <xi:include
+  pertaining to packages provided with Enea Edge <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>
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/doc/book.xml b/doc/book-enea-edge-management-open-source/doc/book.xml
index d140047..715fbe6 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/doc/book.xml
+++ b/doc/book-enea-edge-management-open-source/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_ucpem_open_source">
-  <title><trademark class="registered">Enea</trademark> NFV Access uCPE Manager Open Source Report</title>
+<book id="book_enea_edge_management_open_source">
+  <title><trademark class="registered">Enea</trademark> Edge Management Open Source Report</title>
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/doc/licenses.xml b/doc/book-enea-edge-management-open-source/doc/licenses.xml
index 92b4729..92b4729 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-management-open-source/doc/licenses.xml
diff --git a/doc/book-enea-nfv-access-example-usecases/swcomp.mk b/doc/book-enea-edge-management-open-source/swcomp.mk
index 972746a..4a18540 100755..100644
--- a/doc/book-enea-nfv-access-example-usecases/swcomp.mk
+++ b/doc/book-enea-edge-management-open-source/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-example-usecases
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Example Use-cases"
+BOOKPACKAGES := book-enea-edge-management-open-source
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge Management Open Source Report"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-release-info/doc/about_release.xml b/doc/book-enea-edge-release-info/doc/about_release.xml
index 2078a30..960f136 100644
--- a/doc/book-enea-nfv-access-release-info/doc/about_release.xml
+++ b/doc/book-enea-edge-release-info/doc/about_release.xml
@@ -4,13 +4,13 @@
 <chapter id="relinfo-about-release">
   <title>About This Release</title>
 
-  <para>Enea NFV Access is a complete NFVI software platform designed for
+  <para>Enea Edge is a complete NFVI software platform designed for
   deployment on any white box uCPE device, and optimized for common use cases.
-  Enea NFV Access includes both the Runtime Platform deployed on a white box,
+  Enea Edge includes both the Enea Edge Runtime deployed on a white box,
   and a management component with automation tools deployed in a private or
   public cloud.</para>
 
-  <para>The Enea NFV Access <xi:include
+  <para>The Enea Edge <xi:include
   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
@@ -20,29 +20,29 @@
   Improvements</xref>.</para>
 
   <section id="release-content">
-    <title>Enea NFV Access Release Content</title>
+    <title>Enea Edge Release Content</title>
 
     <para>The release content is detailed below:</para>
 
     <itemizedlist>
       <listitem>
-        <para>Enea_NFV_Access_Run_Time_Platform_C3000_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
+        <para>Enea_Edge_Runtime_C3000_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
       </listitem>
 
       <listitem>
-        <para>Enea_NFV_Access_Run_Time_Platform_XeonD_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
+        <para>Enea_Edge_Runtime_XeonD_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
       </listitem>
 
       <listitem>
-        <para>Enea_NFV_Access_AutomationFramework_&lt;version&gt;-build&lt;build_number&gt;.zip</para>
+        <para>Enea_Edge_Automation_&lt;version&gt;-build&lt;build_number&gt;.zip</para>
       </listitem>
 
       <listitem>
-        <para>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
+        <para>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
       </listitem>
 
       <listitem>
-        <para>Enea_NFV_Access_Telemetry_Deploy_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
+        <para>Enea_Edge_Telemetry_Deploy_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</para>
       </listitem>
 
       <listitem>
@@ -50,14 +50,14 @@
       </listitem>
       
       <listitem>
-        <para>Enea_NFV_Access_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip 
+        <para>Enea_Edge_AF-TH_&lt;version&gt;-build&lt;build_number&gt;.zip 
           (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 New Features and
   Improvements</xref>.)</para>
       </listitem>
     </itemizedlist>
 
     <programlisting condition="arm">-- documentation/
-   /* Enea NFV Access documentation */
+   /* Enea Edge documentation */
 -- README
 -- aarch64 /* architecture */
         -- cn8304/
@@ -104,13 +104,13 @@
   <section id="relinfo-documentation">
     <title>User Documentation</title>
 
-    <para>This release of Enea NFV Access contains the following set of
+    <para>This release of Enea Edge contains the following set of
     documents:</para>
 
     <itemizedlist>
       <listitem>
-        <para>Enea NFV Access Release Information. Describes the Enea NFV
-        Access release content, main changes, the list of known issues and
+        <para>Enea Edge Release Information. Describes the Enea Edge
+        release content, main changes, the list of known issues and
         limitations.</para>
       </listitem>
 
@@ -118,7 +118,7 @@
         <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 deploy and upgrade an Enea NFV Access base
+        Describes how to deploy and upgrade an Enea Edge base
         configuration, advanced configurations of the system and
         troubleshooting information.</para>
       </listitem>
@@ -135,14 +135,14 @@
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_access_auto_fw_user_guide/1)" />. 
-                Describes the Automation Framework for Enea NFV Access.</para>
+                Describes the Automation Framework for Enea Edge.</para>
       </listitem>
 
       <listitem>
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)"
         xmlns:xi="http://www.w3.org/2001/XInclude" />. Describes the 
-          Automation Framework and Test Harness for Enea NFV Access and 
+          Automation Framework and Test Harness for Enea Edge and 
           provides instructions regarding the necessary steps to run these 
           software tools (deprecated, see 
           <xref linkend="relinfo-changes-other">Section 2.1 New Features 
@@ -153,7 +153,7 @@
         <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_access_system_test_specification/1)" />.
-        Describes a sample Test Suite for System Testing of Enea NFV Access.
+        Describes a sample Test Suite for System Testing of Enea Edge.
         (deprecated, see <xref linkend="relinfo-changes-other">Section 2.1 
           New Features and Improvements</xref>).</para>
       </listitem>
diff --git a/doc/book-enea-nfv-access-release-info/doc/book.xml b/doc/book-enea-edge-release-info/doc/book.xml
index 2a48d5a..b886ee1 100644
--- a/doc/book-enea-nfv-access-release-info/doc/book.xml
+++ b/doc/book-enea-edge-release-info/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_release_info">
-  <title><trademark class="registered">Enea</trademark> NFV Access Release
+<book id="book_enea_edge_release_info">
+  <title><trademark class="registered">Enea</trademark> Edge Release
   Information</title>
 
   <subtitle>Release Version
diff --git a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml b/doc/book-enea-edge-release-info/doc/getting_enea_nfv_access.xml
index 9eecd3c..9eecd3c 100644
--- a/doc/book-enea-nfv-access-release-info/doc/getting_enea_nfv_access.xml
+++ b/doc/book-enea-edge-release-info/doc/getting_enea_nfv_access.xml
diff --git a/doc/book-enea-nfv-access-release-info/doc/jiraissues_override.xml b/doc/book-enea-edge-release-info/doc/jiraissues_override.xml
index 7282d0f..7282d0f 100644
--- a/doc/book-enea-nfv-access-release-info/doc/jiraissues_override.xml
+++ b/doc/book-enea-edge-release-info/doc/jiraissues_override.xml
diff --git a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml b/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml
index 4104fa3..1f5fb0c 100644
--- a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
+++ b/doc/book-enea-edge-release-info/doc/known_bugs_and_limitations.xml
@@ -9,7 +9,7 @@
 
   <itemizedlist>
     <listitem>
-      <para><remark>LXCR-9904</remark>Enea NFV Access cannot be installed on
+      <para><remark>LXCR-9904</remark>Enea Edge Runtime cannot be installed on
       USB storage devices.</para>
     </listitem>
 
@@ -20,13 +20,13 @@
 
     <listitem>
       <para><remark>ELCCR-527</remark>Cancelling a file upload in the Enea
-      uCPE Manager will require the user to close and reopen the upload window
+      Edge Management will require the user to close and reopen the upload window
       for the next upload to work.</para>
     </listitem>
 
     <listitem>
-      <para><remark>ELCCR-577</remark>If a uCPEM is restored from a backup
-      made on a release version older than 2.2.3, VNFs cannot be instantiated
+      <para><remark>ELCCR-577</remark>If Enea Edge Management is restored from a backup
+      made on a release version older than Enea NFV Access 2.2.3, VNFs cannot be instantiated
       from the GUI.</para>
     </listitem>
 
@@ -45,8 +45,7 @@
     <listitem>
       <para><remark>ELCCR-847</remark>The Juniper vSRX VNF cannot be
       instantiated on the Xeon-D architectures due to missing CPU features in
-      the VNF's domain XML. This impacts all example use cases and AF&amp;TH
-      tests where the Juniper VNF is used.</para>
+      the VNF's domain XML. This impacts all example use cases where the Juniper VNF is used.</para>
     </listitem>
 
     <listitem>
@@ -65,33 +64,33 @@
     <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 Enea NFV Access Run
-      Time Platform uses the <literal>vfio-pci</literal> driver by default,
+      and <literal>igb_uio</literal> drivers. While the Enea Edge
+      Runtime uses the <literal>vfio-pci</literal> driver by default,
       for certain hardware configurations, <literal>igb_uio</literal> should
       be used instead, by providing custom scripting. Please contact Enea for
       further details.</para>
     </listitem>
 
     <listitem>
-      <para><remark>STCR-6224</remark>The Enea NFV Access Automation Framework
-      and the Enea NFV Access Automation Framework and Test Harness do not
+      <para><remark>STCR-6224</remark>The Enea Edge Automation
+      and the Enea Edge Automation Framework and Test Harness do not
       support multiple custom scripts uploaded to a uCPE device at the same
       time.</para>
     </listitem>
 
     <listitem>
       <para><remark>STCR-6292</remark>Management of WAN Interfaces is not
-      implemented in the Automation Framework and Test Harness.</para>
+      implemented in the Enea Edge Automation Framework and Test Harness.</para>
     </listitem>
 
     <listitem>
-      <para><remark>USERDOCAP-628</remark>Enea NFV Access Automation Framework
+      <para><remark>USERDOCAP-628</remark>Enea Edge Automation Framework
       and Test Harness does not have support for product features implemented
-      in Enea NFV Access 2.4.0 or newer.</para>
+      in Enea Edge 2.4.0 or newer.</para>
     </listitem>
 
     <listitem>
-      <para><remark>ELCCR-912</remark>When the Enea uCPE Manager is installed
+      <para><remark>ELCCR-912</remark>When the Enea Edge Management is installed
       on CentOS 7, prior to C7.1804 (kernel version 3.10.0-862), adding an
       upgrade image fails. As a workaround, please update
       <literal>glib2</literal> to version 2.54.2 or later, using <literal>#yum
@@ -109,9 +108,9 @@
     </listitem>
 
     <listitem>
-      <para><remark>USERDOCAP-641</remark>Enea NFV Access does not have
-      support for IPv6 addresses on both uCPE devices and the Enea uCPE
-      Manager installation.</para>
+      <para><remark>USERDOCAP-641</remark>Enea Edge does not have
+      support for IPv6 addresses on both uCPE devices and the Enea Edge
+      Management installation.</para>
     </listitem>
 
     <listitem>
@@ -143,7 +142,7 @@
 
     <listitem>
       <para><remark>ELCCR-1371</remark>The current self-signed certificate for
-      the Enea uCPE Manager is generated at build time, with a hard-coded
+      the Enea Edge Management is generated at build time, with a hard-coded
       common-name causing the uCPE device upgrade to fail in HTTPS mode. As a
       workaround, another certificate (containing an IP based common-name)
       must be generated.</para>
@@ -153,7 +152,7 @@
 
       <orderedlist>
         <listitem>
-          <para>Stop the uCPE Manager service.</para>
+          <para>Stop the Edge Management service.</para>
         </listitem>
 
         <listitem>
@@ -166,7 +165,7 @@
         </listitem>
 
         <listitem>
-          <para>Start the Enea uCPE Manager, the new certificate should now
+          <para>Start the Enea Edge Management, the new certificate should now
           take effect.</para>
         </listitem>
       </orderedlist>
@@ -199,7 +198,7 @@
     </listitem>
 
     <listitem>
-      <para><remark>ELCCR-1468</remark>When using the Enea uCPE Manager in
+      <para><remark>ELCCR-1468</remark>When using the Enea Edge Management in
       HTTPS mode, upgrading a device from NFV Access 2.3.0 is not possible.
       Either switch to HTTP mode (for more details see <olink
       targetdoc="book_enea_nfv_access_getting_started"
diff --git a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml b/doc/book-enea-edge-release-info/doc/main_changes.xml
index 075d655..10e36a6 100644
--- a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
+++ b/doc/book-enea-edge-release-info/doc/main_changes.xml
@@ -6,8 +6,7 @@
 
   <para>Below you'll find information about the new features and updates made
   in this release, as well as details on the provided packages and the
-  backwards compatibility with previous versions of Enea NFV Access if
-  applicable.</para>
+  backwards compatibility with previous versions.</para>
 
   <section id="relinfo-changes-other">
     <title>New Features and Improvements</title>
@@ -27,17 +26,17 @@
 
       <listitem>
         <para><remark>CPDX-3407</remark>HTTPS based downloads of VNFs for
-        simplified deployment of the Enea uCPE Manager in cloud
+        simplified deployment of the Enea Edge Management in cloud
         environments.</para>
       </listitem>
 
       <listitem>
-        <para><remark>CPDX-3500</remark>The Enea NFV Access Automation
-        Framework, a tool for automatic system configuration based on Python
-        scripting that will replace the existing Enea NFV Access Automation
+        <para><remark>CPDX-3500</remark>The Enea Edge Automation,
+        a tool for automatic system configuration based on Python
+        scripting that will replace the existing Enea Edge Automation
         Framework and Test Harness in the next major release.</para>
 
-        <para>The Enea NFV Access Automation Framework and Test Harness, and
+        <para>The Enea Edge Automation Framework and Test Harness, and
         its related documentation the <xi:include
         href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -45,8 +44,8 @@
         and the <xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xmlns:xi="http://www.w3.org/2001/XInclude"
         xpointer="element(book_enea_nfv_access_system_test_specification/1)" />
-        are deprecated starting with Enea NFV Access 2.4.0.</para>
-      </listitem>
+        are deprecated starting with Enea Edge 2.4.0.</para>
+      </listitem>         
     </itemizedlist>
 
     <para><emphasis role="bold">Improvements:</emphasis></para>
@@ -96,15 +95,15 @@
         <itemizedlist>
           <listitem>
             <para>Platform Snapshots allow users to store, manage and restore
-            snapshots of the Enea NFV Access Runtime Platform configuration,
+            snapshots of the Enea Edge Runtime configuration,
             with the purpose of recovering after a failed reconfiguration.
             This feature is disabled by default.</para>
           </listitem>
 
           <listitem>
             <para>VNF Snapshots allow users to store, manage and restore
-            snapshots of VNFs deployed on the Enea NFV Access Runtime
-            Platform, with the purpose of restoring the VNF after a persistent
+            snapshots of VNFs deployed on the Enea Edge 
+            Runtime, with the purpose of restoring the VNF after a persistent
             VNF failure. This feature is disabled by default.</para>
           </listitem>
         </itemizedlist>
@@ -128,40 +127,42 @@
     <title>Open Source</title>
 
     <para>For more information about the Open Source packages included, please
-    refer to the Enea NFV Access Open Source Reports listed below. Each report
+    refer to the Enea Edge Open Source Reports listed below. Each report
     contains open source and license information pertaining to packages
     provided with this release, for their respective component.</para>
 
     <itemizedlist>
       <listitem>
-        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:ns="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_platform_open_source/1)" />.</para>
-      </listitem>
 
-      <listitem>
-        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:ns="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_ucpem_open_source/1)" />.</para>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xpointer="element(book_enea_nfv_access_platform_open_source/1)"
+        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
       </listitem>
 
       <listitem>
-        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:ns="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_telemetry_open_source/1)" />.</para>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xpointer="element(book_enea_nfv_access_ucpem_open_source/1)"
+        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
+      </listitem>
+          
+          <listitem>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xpointer="element(book_enea_nfv_access_telemetry_open_source/1)"
+        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
       </listitem>
 
       <listitem>
-        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:ns="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_auto_fw_open_source/1)" />.</para>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xpointer="element(book_enea_nfv_access_auto_fw_open_source/1)"
+        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
       </listitem>
 
       <listitem>
-        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
-        xmlns:ns="http://www.w3.org/2001/XInclude"
-        xpointer="element(book_enea_nfv_access_auto_fw_th_open_source/1)" />.</para>
-      </listitem>
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        xpointer="element(book_enea_nfv_access_auto_fw_th_open_source/1)"
+        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
+      </listitem>         
+
     </itemizedlist>
   </section>
 
diff --git a/doc/book-enea-nfv-access-release-info/doc/system_requirements_prerequisites.xml b/doc/book-enea-edge-release-info/doc/system_requirements_prerequisites.xml
index b0317b3..b0317b3 100644
--- a/doc/book-enea-nfv-access-release-info/doc/system_requirements_prerequisites.xml
+++ b/doc/book-enea-edge-release-info/doc/system_requirements_prerequisites.xml
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/swcomp.mk b/doc/book-enea-edge-release-info/swcomp.mk
index 15d7a6d..892f097 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/swcomp.mk
+++ b/doc/book-enea-edge-release-info/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-ucpem-open-source
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access uCPE Manager Open Source Report"
+BOOKPACKAGES := book-enea-edge-release-info
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Release Information"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/README b/doc/book-enea-edge-runtime-open-source/doc/README
index 607ce67..607ce67 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/README
+++ b/doc/book-enea-edge-runtime-open-source/doc/README
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/about.xml b/doc/book-enea-edge-runtime-open-source/doc/about.xml
index 377562c..2a8bf01 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/about.xml
+++ b/doc/book-enea-edge-runtime-open-source/doc/about.xml
@@ -4,5 +4,5 @@
 <chapter id="platform-open-source-packages-and-licenses">
   <title>About this Report</title>
 
-  <para>This document contains the open source and license information pertaining to packages provided with this release of the Enea NFV Access Runtime Platform and the Installer.</para>
+  <para>This document contains the open source and license information pertaining to packages provided with this release of the Enea Edge Runtime and the Installer.</para>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-telemetry-open-source/doc/book.xml b/doc/book-enea-edge-runtime-open-source/doc/book.xml
index b005dae..a575375 100644
--- a/doc/book-enea-nfv-access-telemetry-open-source/doc/book.xml
+++ b/doc/book-enea-edge-runtime-open-source/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_telemetry_open_source">
-  <title><trademark class="registered">Enea</trademark> NFV Access Telemetry Open Source Report</title>
+<book id="book_enea_edge_runtime_open_source">
+  <title><trademark class="registered">Enea</trademark> Edge Runtime Open Source Report</title>
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/licenses.xml b/doc/book-enea-edge-runtime-open-source/doc/licenses.xml
index 352f820..6f9aa06 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-runtime-open-source/doc/licenses.xml
@@ -538,13 +538,13 @@ specific documentation.-->
 <row>
  <entry>enea-nfv-access-vnf</entry>
  <entry>1.0</entry>
- <entry>VNF image of the Enea NFV Access Platform includes kernel rootfs and boot parameters</entry>
+ <entry>VNF image of the Enea Edge Runtime includes kernel rootfs and boot parameters</entry>
  <entry>MIT</entry>
 </row>
 <row>
  <entry>enea-nfv-access</entry>
  <entry>1.0</entry>
- <entry>Image for the host side of the Enea NFV Access Platform with ODM and NETCONF Edgelink customizations</entry>
+ <entry>Image for the host side of the Enea Edge Runtime with ODM and NETCONF Edgelink customizations</entry>
  <entry>MIT</entry>
 </row>
 <row>
@@ -1738,13 +1738,13 @@ specific documentation.-->
 <row>
  <entry>nfv-installer</entry>
  <entry>1.0</entry>
- <entry>Enea NFV Access installer</entry>
+ <entry>Enea Edge installer</entry>
  <entry>Enea</entry>
 </row>
 <row>
  <entry>nfva-cfgtool</entry>
  <entry>1.0</entry>
- <entry>Command line tool to for accessing the Enea NFV Access install configuration json file</entry>
+ <entry>Command line tool to for accessing the Enea Edge install configuration json file</entry>
  <entry>Enea</entry>
 </row>
 <row>
@@ -1960,7 +1960,7 @@ specific documentation.-->
 <row>
  <entry>packagegroup-enea-wifi</entry>
  <entry>1.0</entry>
- <entry>This package group includes packages and packagegroups that enable WiFi     connectivity in the Enea NFV Access platform</entry>
+ <entry>This package group includes packages and packagegroups that enable WiFi     connectivity in the Enea Edge Runtime</entry>
  <entry>MIT</entry>
 </row>
 <row>
diff --git a/doc/book-enea-edge-runtime-open-source/swcomp.mk b/doc/book-enea-edge-runtime-open-source/swcomp.mk
new file mode 100644
index 0000000..cec1da3
--- /dev/null
+++ b/doc/book-enea-edge-runtime-open-source/swcomp.mk
@@ -0,0 +1,10 @@
+# Component build specification
+
+# Version of THIS book
+BOOK_VER ?= $(REL_VER)-dev
+
+DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
+
+BOOKPACKAGES := book-enea-edge-runtime-open-source
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge Runtime Open Source Report"
+BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/book.xml b/doc/book-enea-edge-system-test-specification/doc/book.xml
index 2620554..bcc2dcd 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/book.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_system_test_specification">
-  <title><trademark class="registered">Enea</trademark> NFV Access System Test Specification</title>
+<book id="book_enea_edge_system_test_specification">
+  <title><trademark class="registered">Enea</trademark> Edge System Test Specification</title>
 
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml b/doc/book-enea-edge-system-test-specification/doc/configuration.xml
index 4345326..62d9b72 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/configuration.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/configuration.xml
@@ -5,8 +5,8 @@
   <section id="test_objects">
     <title>Test Objects</title>
 
-    <para>The test objects for the Test Harness are the Enea NFV Access and
-    Enea uCPE Manager installations performed as indicated in the <olink
+    <para>The test objects for the Test Harness are the Enea Edge and
+    Enea Edge Management installations performed as indicated in the <olink
     targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
     targetptr="components">Components chapter of the <xi:include
     href="../../s_docbuild/olinkdb/pardoc-names.xml"
@@ -44,7 +44,7 @@
 
     <note>
       <para>Before running any test case, make sure the uCPE device(s) needed
-      have been added to the uCPE Manager.</para>
+      have been added to the Enea Edge Management.</para>
     </note>
 
     <para>For detailed execution steps of the sample test cases included with
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml b/doc/book-enea-edge-system-test-specification/doc/overview.xml
index 5a04673..07c5ef7 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/overview.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/overview.xml
@@ -3,7 +3,7 @@
   <title>Overview</title>
 
   <para>This document describes the Test Harness (TH) sample test cases for
-  the System Testing of Enea NFV Access, and the necessary environment setup
+  the System Testing of Enea Edge, and the necessary environment setup
   to run these tests successfully.</para>
 
   <section id="def_acro_sts">
@@ -25,10 +25,10 @@
 
         <tbody>
           <row>
-            <entry>Enea NFV Access</entry>
+            <entry>Enea Edge</entry>
 
-            <entry>The Enea NFV Access (with ODM) Runtime Platform and the
-            Enea uCPE Manager.</entry>
+            <entry>The Enea Edge (with ODM) Runtime and the
+            Enea Edge Management.</entry>
           </row>
         </tbody>
       </tgroup>
@@ -52,7 +52,7 @@
           <row>
             <entry>AF</entry>
 
-            <entry>Automation Framework for Enea NFV Access.</entry>
+            <entry>Automation Framework for Enea Edge.</entry>
           </row>
 
           <row>
@@ -88,11 +88,11 @@
           <row>
             <entry>TH</entry>
 
-            <entry>Test Harness for Enea NFV Access.</entry>
+            <entry>Test Harness for Enea Edge.</entry>
           </row>
 
           <row>
-            <entry>uCPE Manager</entry>
+            <entry>Enea Edge Management</entry>
 
             <entry>Enea Universal Customer Premises Equipment Manager.</entry>
           </row>
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml b/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml
index 808ee22..c3796f6 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
+++ b/doc/book-enea-edge-system-test-specification/doc/sample_test_cases.xml
@@ -9,14 +9,14 @@
     <title>VNF, Device and Network Smoke Test Cases</title>
 
     <para>The following is an automated test suite that acts as basic smoke
-    tests for Enea NFV Access, and as a sanity-check test suite for the AF and
+    tests for Enea Edge, and as a sanity-check test suite for the AF and
     TH.</para>
 
     <section id="onb_vnf_image">
       <title>VNF - Onboard a VNF Image</title>
 
       <para><emphasis role="bold">Description: </emphasis>Onboarding a VNF
-      Image into the uCPE Manager. For details please refer to:</para>
+      Image into the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -61,7 +61,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <title>VNF - Offboard a VNF</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing a VNF
-      Descriptor from the uCPE Manager. For details please refer to:</para>
+      Descriptor from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -74,7 +74,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       </itemizedlist>
 
       <para><emphasis role="bold">Precondition:</emphasis> The VNF has been
-      previously onboarded in the uCPE Manager instance.</para>
+      previously onboarded in the Enea Edge Management instance.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>offboardVNF.yml</filename> Ansible Playbook with the
@@ -93,7 +93,7 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
       <title>Device - Add a device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding a uCPE device
-      to the uCPE Manager. For details please refer to:</para>
+      to the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -123,10 +123,10 @@ vnfd=&lt;VNF-Descriptor-name&gt;"</programlisting></para>
     </section>
 
     <section id="device_upload_image">
-      <title>Device - Upload a NFV Access image</title>
+      <title>Device - Upload a Edge image</title>
 
-      <para><emphasis role="bold">Description:</emphasis> Upload a NFV Access
-      image file onto the uCPE Manager. For details please refer to:</para>
+      <para><emphasis role="bold">Description:</emphasis> Upload a Edge
+      image file onto the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -172,7 +172,7 @@ A file with the same name is already uploaded.</programlisting></para>
       <title>Device - Delete Upgraded File</title>
 
       <para><emphasis role="bold">Description:</emphasis> Deleting an uploaded
-      NFV Access image file from the uCPE Manager. For details please refer
+      Edge image file from the Enea Edge Management. For details please refer
       to:</para>
 
       <itemizedlist>
@@ -186,7 +186,7 @@ A file with the same name is already uploaded.</programlisting></para>
       </itemizedlist>
 
       <para><emphasis role="bold">Preconditions:</emphasis> The image file
-      must already be uploaded onto the uCPE Manager.</para>
+      must already be uploaded onto the Enea Edge Management.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>deleteUpgradeFile.yml</filename> Ansible Playbook with the
@@ -237,10 +237,10 @@ localhost                  : ok=1    changed=1    unreachable=0    failed=0</pro
     </section>
 
     <section id="dev_inst_activ">
-      <title>Device - Install and Activate a NFV Access image</title>
+      <title>Device - Install and Activate a Edge image</title>
 
       <para><emphasis role="bold">Description:</emphasis> Installing and
-      Activating a NFV Access image on a uCPE device from the uCPE Manager.
+      Activating a Edge image on a uCPE device from the Enea Edge Management.
       For details please refer to:</para>
 
       <itemizedlist>
@@ -255,13 +255,13 @@ localhost                  : ok=1    changed=1    unreachable=0    failed=0</pro
 
       <para><emphasis role="bold">Preconditions:</emphasis> <itemizedlist>
           <listitem>
-            <para>The device must be previously added to the uCPE Manager
+            <para>The device must be previously added to the Enea Edge Management
             instance.</para>
           </listitem>
 
           <listitem>
-            <para>The image file must already be uploaded onto the uCPE
-            Manager.</para>
+            <para>The image file must already be uploaded onto the Enea Edge
+            Management.</para>
           </listitem>
         </itemizedlist></para>
 
@@ -291,11 +291,11 @@ Duplicate entry - Release already installed</programlisting></para>
     </section>
 
     <section id="dev_upload_inst_activ">
-      <title>Device - Upload, Install and Activate a NFV Access image on a
+      <title>Device - Upload, Install and Activate a Edge image on a
       uCPE device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload, install and
-      activate a NFV Access image on a uCPE device from the uCPE Manager. For
+      activate a Edge image on a uCPE device from the Enea Edge Management. For
       details please refer to:</para>
 
       <itemizedlist>
@@ -335,7 +335,7 @@ Duplicate entry - Release already installed</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the uCPE Manager
+          <para>The device has to be previously added to the Enea Edge Management
           instance.</para>
         </listitem>
 
@@ -371,7 +371,7 @@ upgrade_type=xeon_d</programlisting></para>
       <title>Device - Wait a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Wait for a uCPE
-      device to connect to the uCPE Manager. For details please refer
+      device to connect to the Enea Edge Management. For details please refer
       to:</para>
 
       <itemizedlist>
@@ -388,7 +388,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the uCPE Manager
+          <para>The device has to be previously added to the Enea Edge Management
           instance.</para>
         </listitem>
 
@@ -413,7 +413,7 @@ upgrade_type=xeon_d</programlisting></para>
       <title>Device - Remove a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing a uCPE
-      device from the uCPE Manager. For details please refer to:</para>
+      device from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -429,7 +429,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>The device has to be previously added to the uCPE Manager
+          <para>The device has to be previously added to the Enea Edge Management
           instance.</para>
         </listitem>
 
@@ -472,7 +472,7 @@ upgrade_type=xeon_d</programlisting></para>
       <itemizedlist>
         <listitem>
           <para>A device must have been previously added and connected to the
-          uCPE Manager instance.</para>
+          Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -517,7 +517,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <itemizedlist>
         <listitem>
-          <para>A NIC is bound to a device in a uCPE Manager instance.</para>
+          <para>A NIC is bound to a device in a Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -556,7 +556,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <para><emphasis role="bold">Preconditions:</emphasis><itemizedlist>
           <listitem>
-            <para>A NIC is bound to a device in a uCPE Manager
+            <para>A NIC is bound to a device in a Enea Edge Management
             instance.</para>
           </listitem>
 
@@ -599,7 +599,7 @@ upgrade_type=xeon_d</programlisting></para>
 
       <para><emphasis role="bold">Preconditions:</emphasis><itemizedlist>
           <listitem>
-            <para>A Bridge exists for a device in a uCPE Manager
+            <para>A Bridge exists for a device in a Enea Edge Management
             instance.</para>
           </listitem>
 
@@ -638,8 +638,8 @@ bridge=&lt;Bridge-name&gt;"</programlisting></para>
 
       <para><emphasis role="bold">Precondition: </emphasis></para>
 
-      <para>A device must have been previously added and connected to the uCPE
-      Manager instance.</para>
+      <para>A device must have been previously added and connected to the Enea Edge
+      Management instance.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>configDPDK.yml</filename> Ansible Playbook with the
@@ -657,11 +657,11 @@ DEBUG: Set DPDK state to &lt;enable/disable&gt;</programlisting><emphasis
     </section>
 
     <section id="cs_upload">
-      <title>Custom Scripts - Upload a Custom Script to the uCPE
-      Manager</title>
+      <title>Custom Scripts - Upload a Custom Script to the Enea Edge
+      Management</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload a Custom
-      Script to the uCPE Manager. For details please refer to:</para>
+      Script to the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -689,15 +689,15 @@ phase=
       run using the Test Harness:</para>
 
       <programlisting># Upload Custom Script task result
-DEBUG: "{{ scriptName }} was uploaded to uCPE Manager!"</programlisting>
+DEBUG: "{{ scriptName }} was uploaded to Enea Edge Management!"</programlisting>
     </section>
 
     <section id="cs_upload_device">
-      <title>Custom Scripts - Upload a Custom Script from the uCPE Manager to
+      <title>Custom Scripts - Upload a Custom Script from the Enea Edge Management to
       a Device</title>
 
       <para><emphasis role="bold">Description:</emphasis> Upload a Custom
-      Script from the uCPE Manager to a Device. For details please refer
+      Script from the Enea Edge Management to a Device. For details please refer
       to:</para>
 
       <itemizedlist>
@@ -715,12 +715,12 @@ DEBUG: "{{ scriptName }} was uploaded to uCPE Manager!"</programlisting>
       <itemizedlist>
         <listitem>
           <para>A device must have been previously added and connected to the
-          uCPE Manager instance.</para>
+          Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
-          <para>A Custom Script must have been previously added to the uCPE
-          Manager instance.</para>
+          <para>A Custom Script must have been previously added to the Enea Edge
+          Management instance.</para>
         </listitem>
       </itemizedlist>
 
@@ -741,11 +741,11 @@ DEBUG: "{{ scriptName }} was uploaded to {{ device }}!"</programlisting>
     </section>
 
     <section id="cs_remove">
-      <title>Custom Scripts - Remove a Custom Script from the uCPE
-      Manager</title>
+      <title>Custom Scripts - Remove a Custom Script from the Enea Edge
+      Management</title>
 
       <para><emphasis role="bold">Description:</emphasis> Remove a Custom
-      Script from the uCPE Manager. For details please refer to:</para>
+      Script from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -759,8 +759,8 @@ DEBUG: "{{ scriptName }} was uploaded to {{ device }}!"</programlisting>
 
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
-      <para>A Custom Script must have been previously added to the uCPE
-      Manager.</para>
+      <para>A Custom Script must have been previously added to the Enea Edge
+      Management.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>removeCustomScript.yml</filename> Ansible Playbook with the
@@ -772,8 +772,8 @@ phase=
       <para><emphasis role="bold">Result:</emphasis> Output of the test case
       run using the Test Harness:</para>
 
-      <programlisting># Remove Custom Script in phase from uCPE Manager task result
-DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from uCPE Manager!"</programlisting>
+      <programlisting># Remove Custom Script in phase from Enea Edge Management task result
+DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from Enea Edge Management!"</programlisting>
     </section>
 
     <section id="cs_remove_device">
@@ -797,7 +797,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from uCPE Manager!"<
       <itemizedlist>
         <listitem>
           <para>A device must have been previously added and connected to the
-          uCPE Manager instance.</para>
+          Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -827,7 +827,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding an Offline
-      Config Store to the uCPE Manager. For details please refer to:</para>
+      Config Store to the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -842,7 +842,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       <para><emphasis role="bold">Precondition:</emphasis><itemizedlist>
           <listitem>
             <para>The Offline Configuration Store should not already exist on
-            the uCPE Manager. If it exists, the test will report a
+            the Enea Edge Management. If it exists, the test will report a
             duplicate.</para>
           </listitem>
 
@@ -872,7 +872,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Removing an Offline
-      Config Store from the uCPE Manager. For details please refer to:</para>
+      Config Store from the Enea Edge Management. For details please refer to:</para>
 
       <itemizedlist>
         <listitem>
@@ -887,7 +887,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
       <para>The Offline Configuration Store the user wishes to remove should
-      exist in the uCPE Manager. If it does not, the test will say so.</para>
+      exist in the Enea Edge Management. If it does not, the test will say so.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>removeConfigStore.yml</filename> Ansible Playbook with the
@@ -908,7 +908,7 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
       Configuration Store</title>
 
       <para><emphasis role="bold">Description:</emphasis> Adding a network
-      bridge to an Offline Config Store in uCPE Manager. For details please
+      bridge to an Offline Config Store in Enea Edge Management. For details please
       refer to:</para>
 
       <itemizedlist>
@@ -925,8 +925,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
 
       <itemizedlist>
         <listitem>
-          <para>The Offline Configuration Store should exist in the uCPE
-          Manager. If it does not, the test will say so.</para>
+          <para>The Offline Configuration Store should exist in the Enea Edge
+          Management. If it does not, the test will say so.</para>
         </listitem>
 
         <listitem>
@@ -980,8 +980,8 @@ DEBUG: "{{ scriptName }} from phase {{ phase }} was removed from {{ device }}!"<
 
       <para><emphasis role="bold">Precondition:</emphasis></para>
 
-      <para>An empty Offline Configuration Store should exist in uCPE
-      Manager.</para>
+      <para>An empty Offline Configuration Store should exist in Enea Edge
+      Management.</para>
 
       <para><emphasis role="bold">Action:</emphasis> Run the
       <filename>configOfflineDPDK.yml</filename> Ansible Playbook with the
@@ -1022,12 +1022,12 @@ INFO: Done</programlisting>
 
       <itemizedlist>
         <listitem>
-          <para>The Offline Configuration Store should exist in the uCPE
-          Manager.</para>
+          <para>The Offline Configuration Store should exist in the Enea Edge
+          Management.</para>
         </listitem>
 
         <listitem>
-          <para>The device should be connected to the uCPE Manager.</para>
+          <para>The device should be connected to the Enea Edge Management.</para>
         </listitem>
       </itemizedlist>
 
@@ -1078,7 +1078,7 @@ INFO: Done</programlisting>
         </listitem>
 
         <listitem>
-          <para>The device should be connected to the uCPE Manager.</para>
+          <para>The device should be connected to the Enea Edge Management.</para>
         </listitem>
       </itemizedlist>
 
@@ -1109,8 +1109,7 @@ INFO: Done</programlisting>
     <title>VNF Deployment and Lifecycle</title>
 
     <para>The following details the automated suite that handles the testing
-    of the instantiation, lifecycle and destruction of a VNF for Enea NFV
-    Access.</para>
+    of the instantiation, lifecycle and destruction of a VNF for Enea Edge.</para>
 
     <section id="inst_vnfi">
       <title>Instantiating a VNFI</title>
@@ -1131,7 +1130,7 @@ INFO: Done</programlisting>
       <para><emphasis role="bold">Preconditions:</emphasis> <itemizedlist>
           <listitem>
             <para>A VNF Image is onboarded and a device is added and connected
-            to the uCPE Manager. Depending on the VNF, other steps may be
+            to the Enea Edge Management. Depending on the VNF, other steps may be
             required.</para>
           </listitem>
 
@@ -1250,8 +1249,8 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
         </listitem>
 
         <listitem>
-          <para>Wait for the uCPE device to be connected in the Enea uCPE
-          Manager.</para>
+          <para>Wait for the uCPE device to be connected in the Enea Edge
+          Management.</para>
         </listitem>
 
         <listitem>
@@ -1272,7 +1271,7 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
 
         <listitem>
           <para>Instantiate the FortiGate VNF using the basic Firewall
-          configuration provided with your Enea NFV Access Release, and the
+          configuration provided with your Enea Edge Release, and the
           Fortigate License file.</para>
 
           <note>
@@ -1323,7 +1322,7 @@ vnfi=&lt;VNFI-name&gt;"</programlisting><emphasis
         <itemizedlist>
           <listitem>
             <para>A device must have been previously added and connected to
-            the uCPE Manager instance.</para>
+            the Enea Edge Management instance.</para>
           </listitem>
 
           <listitem>
@@ -1447,7 +1446,7 @@ FortigateFWInstance tested successfully!</programlisting></para>
         <itemizedlist>
           <listitem>
             <para>A device must have been previously added and connected to
-            the uCPE Manager instance.</para>
+            the Enea Edge Management instance.</para>
           </listitem>
 
           <listitem>
@@ -1500,9 +1499,9 @@ FortigateFWInstance tested successfully!</programlisting></para>
               <listitem>
                 <para><olink targetdoc="book_enea_nfv_access_example_usecases"
                 targetptr="fortigate_firewall_uc_1">FortiGate VNF as a
-                Firewall in the <ns:include
+                Firewall in the <xi:include
                 href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                xmlns:ns="http://www.w3.org/2001/XInclude"
+                xmlns:xi="http://www.w3.org/2001/XInclude"
                 xpointer="element(book_enea_nfv_access_example_usecases/1)" /></olink>
                 Manual.</para>
               </listitem>
@@ -1511,8 +1510,8 @@ FortigateFWInstance tested successfully!</programlisting></para>
                 <para><olink
                 targetdoc="book_enea_nfv_access_auto_fw_th_user_guide"
                 targetptr="python_testsuite">Python Unit-Test Suite in
-                <ns:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
-                xmlns:ns="http://www.w3.org/2001/XInclude"
+                <xi:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
+                xmlns:xi="http://www.w3.org/2001/XInclude"
                 xpointer="element(book_enea_nfv_access_auto_fw_th_user_guide/1)" /></olink>.</para>
               </listitem>
             </itemizedlist>
@@ -1542,7 +1541,7 @@ FortigateFW Scenario deployed successfully!</programlisting></para>
 
       <para><emphasis role="bold">Description:</emphasis> This sample test
       case corresponds to the "VNF Chaining Example Use-case" from the Enea
-      NFV Access Example Use-cases Manual.</para>
+      Edge Example Use-cases manual.</para>
 
       <para>For details please refer to:</para>
 
@@ -1565,7 +1564,7 @@ FortigateFW Scenario deployed successfully!</programlisting></para>
       <itemizedlist>
         <listitem>
           <para>Two devices must have been previously added and connected to
-          the uCPE Manager instance.</para>
+          the Enea Edge Management instance.</para>
         </listitem>
 
         <listitem>
@@ -1726,7 +1725,7 @@ LAN-to-LAN connectivity (through VPN tunnel)tested successfully!</programlisting
 
     <orderedlist spacing="compact">
       <listitem>
-        <para>Upload a Custom Script onto the uCPE Manager.</para>
+        <para>Upload a Custom Script onto the Enea Edge Management.</para>
       </listitem>
 
       <listitem>
@@ -1746,7 +1745,7 @@ LAN-to-LAN connectivity (through VPN tunnel)tested successfully!</programlisting
       </listitem>
 
       <listitem>
-        <para>Remove the Custom Script from the uCPE Manager.</para>
+        <para>Remove the Custom Script from the Enea Edge Management.</para>
       </listitem>
     </orderedlist>
 
@@ -1755,7 +1754,7 @@ LAN-to-LAN connectivity (through VPN tunnel)tested successfully!</programlisting
     <itemizedlist>
       <listitem>
         <para>A device must have been previously added and connected to the
-        uCPE Manager.</para>
+        Enea Edge Management.</para>
       </listitem>
 
       <listitem>
@@ -1792,7 +1791,7 @@ inteld1521-1 ansible_host=172.24.12.73 ansible_port=22 ansible_user=root \
     <para><emphasis role="bold">Result:</emphasis> Output of
     <filename>basicTest.yml</filename>:</para>
 
-    <programlisting>test_success_after_always was uploaded to uCPE Manager!
+    <programlisting>test_success_after_always was uploaded to Enea Edge Management!
 test_success_after_always was uploaded to &lt;Device-name&gt;!
 
 &lt;Device-name&gt; device is connected!
@@ -1800,6 +1799,6 @@ test_success_after_always from phase always-after-startup was removed \
 from &lt;Device-name&gt;!
 
 test_success_after_always from phase always-after-startup was removed \
-from uCPE Manager!</programlisting>
+from Enea Edge Management!</programlisting>
   </section>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-telemetry-open-source/swcomp.mk b/doc/book-enea-edge-system-test-specification/swcomp.mk
index 0314da2..2830cc3 100644..100755
--- a/doc/book-enea-nfv-access-telemetry-open-source/swcomp.mk
+++ b/doc/book-enea-edge-system-test-specification/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-telemetry-open-source
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access Telemetry Open Source Report"
+BOOKPACKAGES := book-enea-edge-system-test-specification
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) System Test Specification"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/doc/README b/doc/book-enea-edge-telemetry-open-source/doc/README
index 1077acb..1077acb 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/doc/README
+++ b/doc/book-enea-edge-telemetry-open-source/doc/README
diff --git a/doc/book-enea-nfv-access-telemetry-open-source/doc/about.xml b/doc/book-enea-edge-telemetry-open-source/doc/about.xml
index 781b0bd..5366626 100644
--- a/doc/book-enea-nfv-access-telemetry-open-source/doc/about.xml
+++ b/doc/book-enea-edge-telemetry-open-source/doc/about.xml
@@ -5,7 +5,7 @@
   <title>About this Report</title>
 
   <para>This document contains the open source and license information
-  pertaining to telemetry packages provided with Enea NFV Access <xi:include
+  pertaining to telemetry packages provided with Enea Edge <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>
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/book.xml b/doc/book-enea-edge-telemetry-open-source/doc/book.xml
index a17bb3d..9b0aa33 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/book.xml
+++ b/doc/book-enea-edge-telemetry-open-source/doc/book.xml
@@ -3,8 +3,8 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book_enea_nfv_access_platform_open_source">
-  <title><trademark class="registered">Enea</trademark> NFV Access Runtime Platform Open Source Report</title>
+<book id="book_enea_edge_telemetry_open_source">
+  <title><trademark class="registered">Enea</trademark> Edge Telemetry Open Source Report</title>
   <subtitle>Release Version
          <xi:include href="../../s_doceneacommon/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
diff --git a/doc/book-enea-nfv-access-telemetry-open-source/doc/licenses.xml b/doc/book-enea-edge-telemetry-open-source/doc/licenses.xml
index 3cffaae..3cffaae 100644
--- a/doc/book-enea-nfv-access-telemetry-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-telemetry-open-source/doc/licenses.xml
diff --git a/doc/book-enea-edge-telemetry-open-source/swcomp.mk b/doc/book-enea-edge-telemetry-open-source/swcomp.mk
new file mode 100644
index 0000000..cf28954
--- /dev/null
+++ b/doc/book-enea-edge-telemetry-open-source/swcomp.mk
@@ -0,0 +1,10 @@
+# Component build specification
+
+# Version of THIS book
+BOOK_VER ?= $(REL_VER)-dev
+
+DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
+
+BOOKPACKAGES := book-enea-edge-telemetry-open-source
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge Telemetry Open Source Report"
+BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
deleted file mode 100755
index a345989..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/ChainedVNFsService_setup.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
deleted file mode 100755
index a597a91..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/autofw_testh_overview.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
deleted file mode 100755
index 6bd35d4..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/images/environment_basicsetup.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/swcomp.mk b/doc/book-enea-nfv-access-auto-fw-th-user-guide/swcomp.mk
deleted file mode 100755
index 9f0a075..0000000
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/swcomp.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Component build specification
-
-# Version of THIS book
-BOOK_VER ?= $(REL_VER)-dev
-
-DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
-
-BOOKPACKAGES := book-enea-nfv-access-auto-fw-th-user-guide
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Automation Framework and Test Harness User Guide"
-BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png
index 10984da..1367d32 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png
+++ b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_overview.png
diff --git a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png
index 8f18afc..12e45f9 100644
--- a/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png
+++ b/doc/book-enea-nfv-access-evalkit/doc/images/br_to_br_conn_setup.png
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png
deleted file mode 100644
index 791f542..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png b/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png
deleted file mode 100644
index da0824d..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/trgt_servicechain.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png
deleted file mode 100755
index 6366b61..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_bridge.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png
deleted file mode 100755
index d6a8d57..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_clavister_sriov.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png
deleted file mode 100755
index 48ff9cc..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_enea_test_vnf.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png
deleted file mode 100755
index fe18850..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_fw.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png
deleted file mode 100755
index cd82461..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_fortigate_sdwan.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png b/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png
deleted file mode 100755
index d2527e5..0000000
--- a/doc/book-enea-nfv-access-example-usecases/doc/images/uc_vnf_chaining.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png b/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png
deleted file mode 100644
index 23cc973..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/images/high_av_setup.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png b/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png
deleted file mode 100755
index 1a5ddab..0000000
--- a/doc/book-enea-nfv-access-getting-started/doc/images/vnf_space.png
+++ /dev/null
diff --git a/doc/book-enea-nfv-access-system-test-specification/swcomp.mk b/doc/book-enea-nfv-access-system-test-specification/swcomp.mk
deleted file mode 100755
index aea86ca..0000000
--- a/doc/book-enea-nfv-access-system-test-specification/swcomp.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Component build specification
-
-# Version of THIS book
-BOOK_VER ?= $(REL_VER)-dev
-
-DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
-
-BOOKPACKAGES := book-enea-nfv-access-system-test-specification
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) System Test Specification"
-BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)