From e55c3d2a23de3eac0ae2f312b27a478e041b48e8 Mon Sep 17 00:00:00 2001
From: iosc <ioana.scurt@enea.com>
Date: Fri, 19 Mar 2021 13:07:53 +0100
Subject: USERDOCAP-636 - all books changes

Change-Id: I944098c2d726657c91edff3d62dc4a40fc8df8bb
Signed-off-by: iosc <ioana.scurt@enea.com>
---
 doc/Makefile                                       |   8 +-
 .../doc/about.xml                                  |   2 +-
 .../doc/book.xml                                   |   2 +-
 .../doc/licenses.xml                               |   4 +-
 .../swcomp.mk                                      |   2 +-
 .../book-enea-nfv-access-auto-fw-th-user-guide.pdf | Bin 0 -> 401538 bytes
 .../doc/automation_framework_test_harness.xml      | 364 ++++++++++-----------
 .../doc/book.xml                                   |   2 +-
 .../doc/components.xml                             |  51 ++-
 .../doc/getting_started.xml                        |  32 +-
 .../doc/overview.xml                               |  23 +-
 .../doc/troubleshooting_guide.xml                  |   4 +-
 .../swcomp.mk                                      |   2 +-
 .../doc/128t_vnf_router.xml                        |   6 +-
 .../doc/appendix_4.xml                             |   4 +-
 .../doc/appendix_5.xml                             |   6 +-
 .../doc/book.xml                                   |   2 +-
 .../doc/clav_vnf_examples.xml                      |   4 +-
 .../doc/enea_test_vnf_examples.xml                 |  12 +-
 .../doc/forti_vnf_examples.xml                     |   8 +-
 .../doc/introduction.xml                           |   4 +-
 .../doc/service_chaining_128t_fortigate.xml        |   4 +-
 .../doc/vnf_chaining.xml                           |  10 +-
 .../swcomp.mk                                      |   2 +-
 .../doc/advanced_configurations.xml                | 178 +++++-----
 .../doc/book.xml                                   |   2 +-
 .../doc/grafana.xml                                | 209 ++++++------
 .../doc/installation_guide.xml                     | 256 +++++++--------
 .../doc/introduction.xml                           |  46 +--
 .../doc/log_collector.xml                          |  46 +--
 .../doc/net_config_options.xml                     | 123 +++----
 .../doc/troubleshooting.xml                        |  74 ++---
 .../doc/upgrade_ena.xml                            |  79 ++---
 .../doc/vnf_mg.xml                                 | 102 +++---
 doc/book-enea-nfv-access-getting-started/swcomp.mk |   2 +-
 .../doc/about.xml                                  |   2 +-
 .../doc/book.xml                                   |   2 +-
 .../doc/licenses.xml                               |  10 +-
 .../swcomp.mk                                      |   2 +-
 .../doc/about_release.xml                          |  36 +-
 doc/book-enea-nfv-access-release-info/doc/book.xml |   2 +-
 .../doc/known_bugs_and_limitations.xml             |  37 +--
 .../doc/main_changes.xml                           |  45 ++-
 doc/book-enea-nfv-access-release-info/swcomp.mk    |   2 +-
 .../doc/book.xml                                   |   2 +-
 .../doc/configuration.xml                          |   6 +-
 .../doc/overview.xml                               |  14 +-
 .../doc/sample_test_cases.xml                      | 153 +++++----
 .../swcomp.mk                                      |   2 +-
 .../doc/about.xml                                  |   2 +-
 .../doc/book.xml                                   |   2 +-
 .../swcomp.mk                                      |   2 +-
 .../doc/about.xml                                  |   2 +-
 .../doc/book.xml                                   |   2 +-
 .../swcomp.mk                                      |   2 +-
 55 files changed, 1002 insertions(+), 1000 deletions(-)
 create mode 100644 doc/book-enea-nfv-access-auto-fw-th-user-guide/book-enea-nfv-access-auto-fw-th-user-guide.pdf

diff --git a/doc/Makefile b/doc/Makefile
index a0956d4..1a415b3 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-cmc-example-usecases book-enea-nfv-access-example-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-platform-open-source book-enea-nfv-access-getting-started book-enea-nfv-access-ucpem-open-source book-enea-nfv-access-telemetry-open-source book-enea-nfv-access-release-info book-enea-nfv-access-system-test-specification book-enea-nfv-access-evalkit
+COMPONENTS := book-enea-nfv-access-auto-fw-th-open-source book-enea-nfv-access-auto-fw-th-user-guide book-enea-nfv-access-cmc-example-usecases book-enea-nfv-access-example-usecases book-enea-nfv-access-getting-started book-enea-nfv-access-platform-open-source book-enea-nfv-access-ucpem-open-source book-enea-nfv-access-telemetry-open-source book-enea-nfv-access-release-info book-enea-nfv-access-system-test-specification book-enea-nfv-access-evalkit book-enea-nfv-access-auto-fw-open-source book-enea-nfv-access-auto-fw-user-guide
 
 
 # --------------------------------------------------------------
@@ -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/about.xml b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml
index dbf06e3..4dc19aa 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/about.xml
@@ -6,7 +6,7 @@
 
   <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
+  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-nfv-access-auto-fw-th-open-source/doc/book.xml
index 3305873..f849ad4 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/book.xml
@@ -4,7 +4,7 @@
 <!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>
+  <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-nfv-access-auto-fw-th-open-source/doc/licenses.xml
index 31e8edb..76a34e2 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/doc/licenses.xml
@@ -40,7 +40,7 @@
             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>
@@ -54,7 +54,7 @@
             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>
diff --git a/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk b/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk
index 2f2e677..702e86f 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk
+++ b/doc/book-enea-nfv-access-auto-fw-th-open-source/swcomp.mk
@@ -6,5 +6,5 @@ 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"
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) AF&TH Open Source Report"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/book-enea-nfv-access-auto-fw-th-user-guide.pdf b/doc/book-enea-nfv-access-auto-fw-th-user-guide/book-enea-nfv-access-auto-fw-th-user-guide.pdf
new file mode 100644
index 0000000..5d601c1
Binary files /dev/null and b/doc/book-enea-nfv-access-auto-fw-th-user-guide/book-enea-nfv-access-auto-fw-th-user-guide.pdf differ
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index 5e6ba24..a569d59 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
@@ -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
@@ -79,7 +79,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">
@@ -88,16 +88,16 @@
         <programlisting>$ python unittestSuite.py -h
 Usage: unittestSuite.py [options]
 
-Run selected unit-test suite against Enea uCPE Manager.
+Run selected unit-test suite against Enea Edge Management.
 
 Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -n DEVICENAME, --deviceName=DEVICENAME
                         Name of vCPE device (Virtual Infrastructure Manager)
   -s SUITEFILE, --suite=SUITEFILE
@@ -234,8 +234,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 +243,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 +251,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 +540,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>
@@ -548,16 +548,16 @@ OK</programlisting>
         <programlisting>$ python addDevice.py -h
 Usage: addDevice.py [options]
 
-Add a uCPE device in Enea uCPE Manager.
+Add a uCPE device in Enea Edge Management.
 
 Options:
  --version show program's version number and exit
  -h, --help show this help message and exit
  -u USERNAME, --username=USERNAME
- Enea uCPE Manager login username
+ Enea Edge Management login username
  -p PASSWORD, --password=PASSWORD
- Enea uCPE Manager login password
- -H HOST, --host=HOST Enea uCPE Manager host name or IP address
+ Enea Edge Management login password
+ -H HOST, --host=HOST Enea Edge Management host name or IP address
  -f DEVICEFILE, --file=DEVICEFILE
  File containing uCPE Information in JSON format
 
@@ -615,7 +615,7 @@ Options:
 2019-03-07 17:33:10,756 - INFO: Add uCPE device
 2019-03-07 17:33:10,975 - DEBUG: Login successful on host 'localhost'
 2019-03-07 17:33:10,979 - DEBUG: Session token is: 508b6ea2-40ee-11e9-a81f525400d08e1d
-2019-03-07 17:33:11,049 - DEBUG: Add new device 'intelc3850-2' to uCPE Manager host
+2019-03-07 17:33:11,049 - DEBUG: Add new device 'intelc3850-2' to Enea Edge Management host
 2019-03-07 17:33:11,483 - INFO: Done
 2019-03-07 17:33:11,501 - DEBUG: Logging out and exiting....</programlisting>
       </section>
@@ -624,7 +624,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">
@@ -633,16 +633,16 @@ Options:
         <programlisting>$ python removeDevice.py -h
 Usage: removeDevice.py [options]
 
-Remove a uCPE from Enea uCPE Manager.
+Remove a uCPE from Enea Edge Management.
 
 Options:
  --version show program's version number and exit
  -h, --help show this help message and exit
  -u USERNAME, --username=USERNAME
- Enea uCPE Manager login username
+ Enea Edge Management login username
  -p PASSWORD, --password=PASSWORD
- Enea uCPE Manager login password
- -H HOST, --host=HOST Enea uCPE Manager host name or IP address
+ Enea Edge Management login password
+ -H HOST, --host=HOST Enea Edge Management host name or IP address
  -f DEVICEFILE, --file=DEVICEFILE
  File containing uCPE Information in JSON format
 
@@ -689,7 +689,7 @@ Options:
 2019-03-07 17:33:56,835 - INFO: Remove uCPE device
 2019-03-07 17:33:56,856 - DEBUG: Login successful on host 'localhost'
 2019-03-07 17:33:56,856 - DEBUG: Session token is: 6bebcb43-40ee-11e9-a81f525400d08e1d
-2019-03-07 17:33:56,856 - DEBUG: Delete device 'intelc3850-2' from uCPE Manager
+2019-03-07 17:33:56,856 - DEBUG: Delete device 'intelc3850-2' from Enea Edge Management
 host
 2019-03-07 17:33:56,875 - DEBUG: Found device with name 'intelc3850-2'
 2019-03-07 17:33:57,159 - INFO: Done
@@ -701,7 +701,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>
@@ -709,16 +709,16 @@ host
         <programlisting>$ python waitDeviceUp.py -h
 Usage: waitDeviceUp.py [options]
 
-Wait for uCPE to connect to the Enea uCPE Manager after installation.
+Wait for uCPE to connect to the Enea Edge Management after installation.
 
 Options:
  --version show program's version number and exit
  -h, --help show this help message and exit
  -u USERNAME, --username=USERNAME
- Enea uCPE Manager login username
+ Enea Edge Management login username
  -p PASSWORD, --password=PASSWORD
- Enea uCPE Manager login password
- -H HOST, --host=HOST Enea uCPE Manager host name or IP address
+ Enea Edge Management login password
+ -H HOST, --host=HOST Enea Edge Management host name or IP address
  -f DEVICEFILE, --file=DEVICEFILE
  File containing uCPE Information in JSON format
  -t TIMEOUT, --timeout=TIMEOUT
@@ -779,7 +779,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>
@@ -787,14 +787,14 @@ Options:
         <programlisting>$ python getEventsForUcpe.py -h
 Usage: getEventsForUcpe.py [options]
 
-Print the events log for a specific uCPE installed in Enea uCPE Manager.
+Print the events log for a specific uCPE installed in Enea Edge Management.
 
 Options:
 --version                          show program's version number and exit
 -h, --help                         show this help message and exit
--u USERNAME, --username=USERNAME   Enea uCPE Manager login username
--p PASSWORD, --password=PASSWORD   Enea uCPE Manager login password
--H HOST, --host=HOST               Enea uCPE Manager host name or IP address
+-u USERNAME, --username=USERNAME   Enea Edge Management login username
+-p PASSWORD, --password=PASSWORD   Enea Edge Management login password
+-H HOST, --host=HOST               Enea Edge Management host name or IP address
 -f DEVICEFILE, --file=DEVICEFILE   File containing uCPE Information in JSON format
 -s SEVERITY, --severity=SEVERITY   Event severity level (Critical|Major|Minor)
 
@@ -869,10 +869,10 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -s STATE, --state=STATE
                         Enable/Disable
   -n DEVICENAME, --device-name=DEVICENAME
@@ -936,10 +936,10 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -f NICFILE, --file=NICFILE
                         File containing network interface Information in JSON
                         format
@@ -1042,10 +1042,10 @@ Options:
  --version show program's version number and exit
  -h, --help show this help message and exit
  -u USERNAME, --username=USERNAME
- Enea uCPE Manager login username
+ Enea Edge Management login username
  -p PASSWORD, --password=PASSWORD
- Enea uCPE Manager login password
- -H HOST, --host=HOST Enea uCPE Manager host name or IP address
+ Enea Edge Management login password
+ -H HOST, --host=HOST Enea Edge Management host name or IP address
  -f NICFILE, --file=NICFILE
  File containing network interface Information in JSON
  format
@@ -1131,9 +1131,9 @@ Usage: getNetworkInterfaces.py [options]
 Options:
   --version                               show program's version number and exit
   -h, --help                              show this help message and exit
-  -u USERNAME, --username=USERNAME        Enea uCPE Manager login username
-  -p PASSWORD, --password=PASSWORD        Enea uCPE Manager login password
-  -H HOST, --host=HOST                    Enea uCPE Manager host name or IP address
+  -u USERNAME, --username=USERNAME        Enea Edge Management login username
+  -p PASSWORD, --password=PASSWORD        Enea Edge Management login password
+  -H HOST, --host=HOST                    Enea Edge Management host name or IP address
   -n DEVICENAME, --device-name=DEVICENAME Name of the uCPE to get network /
                                           interfaces from
 
@@ -1215,10 +1215,10 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -f OVSFILE, --file=OVSFILE
                         File containing OVS bridge Information in JSON format
   -n DEVICENAME, --device-name=DEVICENAME
@@ -1306,10 +1306,10 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -f OVSFILE, --file=OVSFILE
                         File containing OVS bridge Information in JSON format
   -n DEVICENAME, --device-name=DEVICENAME
@@ -1380,7 +1380,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">
@@ -1389,16 +1389,16 @@ Options:
         <programlisting>$ python onboardVNFRaw.py -h
 Usage: onboardVNFRaw.py [options]
 
-Onboard a VNF in Enea uCPE Manager based upon its raw constituents.
+Onboard a VNF in Enea Edge Management based upon its raw constituents.
 
 Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -f FTPUSERNAME, --ftpUsername=FTPUSERNAME
                         Username for FTP
   -w FTPPASSWORD, --ftpPassword=FTPPASSWORD
@@ -1497,7 +1497,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">
@@ -1506,16 +1506,16 @@ Options:
         <programlisting>$ python offboardVNF.py -h
 Usage: offboardVNF.py [options]
 
-Offboard a VNF from Enea uCPE Manager.
+Offboard a VNF from Enea Edge Management.
 
 Options:
  --version show program's version number and exit
  -h, --help show this help message and exit
  -u USERNAME, --username=USERNAME
- Enea uCPE Manager login username
+ Enea Edge Management login username
  -p PASSWORD, --password=PASSWORD
- Enea uCPE Manager login password
- -H HOST, --host=HOST Enea uCPE Manager host name or IP address
+ Enea Edge Management login password
+ -H HOST, --host=HOST Enea Edge Management host name or IP address
  -n VNFDNAME, --vnfdName=VNFDNAME
  Name of VNF descriptor to offboard
 
@@ -1563,7 +1563,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>
@@ -1571,16 +1571,16 @@ Options:
         <programlisting>$ python instantiateVNFI.py -h
 Usage: instantiateVNFI.py [options]
 
-Instantiate a VNF via Enea uCPE Manager.
+Instantiate a VNF via Enea Edge Management.
 
 Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -t VNFTYPE, --vnfType=VNFTYPE
                         VNF Type (Name of VNF descriptor)
   -n VIMDEVICENAME, --device-name=VIMDEVICENAME
@@ -1642,7 +1642,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 +1651,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">
@@ -1660,16 +1660,16 @@ License("vnf_config/fortigateImage/fortigateLicense.lic")
         <programlisting>$ python controlVNFI.py -h
 Usage: controlVNFI.py [options]
 
-Controls a VNF instance from Enea uCPE Manager.
+Controls a VNF instance from Enea Edge Management.
 
 Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -i VNFINSTANCENAME, --vnfInstanceName=VNFINSTANCENAME
                         Name of VNF instance
   -n VIMDEVICENAME, --device-name=VIMDEVICENAME
@@ -1736,7 +1736,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>
@@ -1744,16 +1744,16 @@ fortigateFWInstance -c stop
         <programlisting>$ python destroyVNFI.py -h
 Usage: destroyVNFI.py [options]
 
-Destroys a VNF instance from Enea uCPE Manager.
+Destroys a VNF instance from Enea Edge Management.
 
 Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -i VNFINSTANCENAME, --vnfInstanceName=VNFINSTANCENAME
                         Name of VNF instance
   -n VIMDEVICENAME, --device-name=VIMDEVICENAME
@@ -1801,28 +1801,28 @@ fortigateFWInstance
     </section>
 
     <section id="upload_vnf_image">
-      <title>Uploading a NFV Access image onto the Enea uCPE Manager</title>
+      <title>Uploading a 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 a Enea Edge image onto the
+      Enea Edge Management are described below.</para>
 
       <section id="script_opts_upload">
         <title>Script Options</title>
 
         <programlisting>$ python uploadImage.py -h
-Upload NFVA image on uCPE Manager
+Upload NFVA image on Enea Edge Management
 Usage: uploadImage.py [options]
 
-Upload NFVA image on uCPE Manager.
+Upload NFVA image on Enea Edge Management.
 
 Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -f FILENAME, --fileName=FILENAME
                         Path to NFVA image file name
   -m MODULE, --module=MODULE
@@ -1838,7 +1838,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 a 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>
@@ -1846,7 +1846,7 @@ Options:
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis><programlisting>[
  {
- "name": "Upload NFVA image on uCPE Manager",
+ "name": "Upload NFVA image on Enea Edge Management",
  "args": "-f /tmp/enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d"
  }
 ]</programlisting></para>
@@ -1861,7 +1861,7 @@ Options:
         <programlisting>$ python uploadImage.py -u admin -p admin -H localhost \
 -f /tmp/enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d
 2020-02-28 11:38:42,754 - DEBUG: Started logging
-2020-02-28 11:38:42,755 - INFO: Upload NFVA image on uCPE Manager
+2020-02-28 11:38:42,755 - INFO: Upload NFVA image on Enea Edge Management
 2020-02-28 11:38:43,307 - DEBUG: Login successful on host 'localhost'
 2020-02-28 11:38:43,308 - DEBUG: Session token is: 7da3f960-5a16-11ea-a3de-5652b3ac1c30
 2020-02-28 11:41:29,148 - INFO: Verify image validation flag
@@ -1874,29 +1874,29 @@ Options:
     </section>
 
     <section id="delete_vnf_image">
-      <title>Deleting a NFV Access image file from the Enea uCPE
-      Manager</title>
+      <title>Deleting a 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 a Enea Edge image from the
+      Enea Edge Management are described below.</para>
 
       <section id="script_opts_deleteupload">
         <title>Script Options</title>
 
         <programlisting>$ python deleteUpgradeFile.py -h
-Delete NFVA image from uCPE Manager
+Delete NFVA image from Enea Edge Management
 Usage: deleteUpgradeFile.py [options]
 
-Delete NFVA image from uCPE Manager.
+Delete NFVA image from Enea Edge Management.
 
 Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -i IMAGENAME, --imageName=IMAGENAME
                         NFVA Image name
   -m MODULE, --module=MODULE
@@ -1909,7 +1909,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 a 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>
@@ -1917,7 +1917,7 @@ Options:
         <para><emphasis role="bold">Sample unit-test JSON file
         format:</emphasis><programlisting>[
  {
- "name": "Delete NFVA image on uCPE Manager",
+ "name": "Delete NFVA image on Enea Edge Management",
  "args": "-i enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2"
  }
 ]</programlisting></para>
@@ -1932,7 +1932,7 @@ Options:
         <programlisting>$ python deleteUpgradeFile.py -u admin -p admin -H localhost -i \
 enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2
 2020-02-28 12:06:20,111 - DEBUG: Started logging
-2020-02-28 12:06:20,112 - INFO: Delete NFVA image from uCPE Manager
+2020-02-28 12:06:20,112 - INFO: Delete NFVA image from Enea Edge Management
 2020-02-28 12:06:20,210 - DEBUG: Login successful on host 'localhost'
 2020-02-28 12:06:20,211 - DEBUG: Session token is: 594b2d50-5a1a-11ea-a3de-5652b3ac1c30
 2020-02-28 12:06:20,255 - INFO: The image \
@@ -1948,30 +1948,30 @@ 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 a 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 a Enea Edge
+      image on an uCPE device from the Enea Edge Management are described
       below.</para>
 
       <section id="script_opts_install_activate">
         <title>Script Options</title>
 
         <programlisting>$ python installAndActivate.py -h
-Install and activate NFVA image from uCPE Manager
+Install and activate NFVA image from Enea Edge Management
 Usage: installAndActivate.py [options]
 
-Install and activate NFVA image from uCPE Manager.
+Install and activate NFVA image from Enea Edge Management.
 
 Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -i IMAGENAME, --imageName=IMAGENAME
                         Image name
   -m MODULE, --module=MODULE
@@ -1989,8 +1989,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 a 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>
@@ -2000,7 +2000,7 @@ Options:
 
         <programlisting>[
  {
- "name": "Install and activate NFVA image on uCPE device from uCPE Manager",
+ "name": "Install and activate NFVA image on uCPE device from Enea Edge Management",
  "args": "-i enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d -d inteld1521-16"
  }
 ]</programlisting>
@@ -2015,7 +2015,7 @@ Options:
         <programlisting>$ python installAndActivate.py -u admin -p admin -H localhost -i \
 enea-nfv-access-xeon-d.rootfs.ostree.tar.bz2 -t xeon_d -d inteld1521-16
 2020-02-28 12:36:46,137 - DEBUG: Started logging
-2020-02-28 12:36:46,138 - INFO: Install and activate NFVA image from uCPE Manager
+2020-02-28 12:36:46,138 - INFO: Install and activate NFVA image from Enea Edge Management
 2020-02-28 12:36:46,288 - DEBUG: Login successful on host 'localhost'
 2020-02-28 12:36:46,288 - DEBUG: Session token is: 99b7cde0-5a1e-11ea-a3de-5652b3ac1c30
 2020-02-28 12:36:46,325 - DEBUG: Found device with name 'inteld1521-16'
@@ -2055,10 +2055,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">
@@ -2074,10 +2074,10 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
 
   Mandatory options:
     -H/--host </programlisting>
@@ -2087,7 +2087,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 +2110,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>
@@ -2122,16 +2122,16 @@ Options:
 2020-04-14 10:26:23,582 - INFO: Upload Custom Script
 Usage: upload.py [options]
 
-Add a Custom Script to Enea uCPE Manager
+Add a Custom Script to Enea Edge Management
 
 Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -f CUSTOMSCRIPT, --file=CUSTOMSCRIPT
                         Custom Script File
   -e PHASE, --phase=PHASE
@@ -2147,7 +2147,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>
 
@@ -2156,7 +2156,7 @@ Options:
 
         <programlisting>[
  {
-  "name": "Uploading a Custom Script to the uCPE Manager",
+  "name": "Uploading a Custom Script to the Enea Edge Management",
   "args": "-f ../../lab_config/customScripts/test_success_after_always \
   -e always-after-startup"
  }
@@ -2175,7 +2175,7 @@ Options:
 2020-04-14 14:08:02,915 - INFO: Upload Custom Script
 2020-04-14 14:08:02,994 - DEBUG: Login successful on host '172.24.3.109'
 2020-04-14 14:08:02,995 - DEBUG: Session token is: 97544990-7e48-11ea-835c-02423a1c239f
-2020-04-14 14:08:02,996 - DEBUG: Upload test_success_after_always to uCPE Manager. \
+2020-04-14 14:08:02,996 - DEBUG: Upload test_success_after_always to Enea Edge Management. \
 Content: #!/bin/bash
 echo test_success_after_always
 2020-04-14 14:08:03,138 - INFO: Done
@@ -2184,11 +2184,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>
@@ -2203,12 +2203,12 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -c CUSTOMSCRIPTNAME, --customScriptName=CUSTOMSCRIPTNAME
-                        Custom Script Name that resides on Enea uCPE Manager
+                        Custom Script Name that resides on Enea Edge Management
   -e PHASE, --phase=PHASE
                         Execution phase. Must be one of the following: once-
                         before-startup | always-before-startup | once-after-
@@ -2225,7 +2225,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
@@ -2236,7 +2236,7 @@ Options:
 
         <programlisting>[
 {
-"name": "Uploading a Custom Script from uCPE Manager to device",
+"name": "Uploading a Custom Script from Enea Edge Management to device",
 "args": "-c test_success_after_always -e always-after-startup -n inteld1521-6"
 }
 ]</programlisting>
@@ -2263,16 +2263,16 @@ 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>
 
         <programlisting>$ python customScripts/delete.py -h
-2020-04-14 14:36:52,010 - INFO: Delete Custom Script on uCPE Manager
+2020-04-14 14:36:52,010 - INFO: Delete Custom Script on Enea Edge Management
 Usage: delete.py [options]
 
 Delete a Custom Script from a Device
@@ -2281,10 +2281,10 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -c CUSTOMSCRIPTNAME, --customScriptName=CUSTOMSCRIPTNAME
                         Custom Script Name that resides on a Device
   -e PHASE, --phase=PHASE
@@ -2300,8 +2300,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>
 
@@ -2310,7 +2310,7 @@ Options:
 
         <programlisting>[
 {
-"name": "Removing a Custom Script from uCPE Manager",
+"name": "Removing a Custom Script from Enea Edge Management",
 "args": "-c test_success_after_always -e always-after-startup"
 }
 ]</programlisting>
@@ -2325,12 +2325,12 @@ Options:
         <programlisting>$ python automation_framework/customScripts/delete.py -c \
 test_success_after_always -e always-after-startup
 2020-04-14 14:39:22,042 - DEBUG: Started logging
-2020-04-14 14:39:22,042 - INFO: Delete Custom Script on uCPE Manager
+2020-04-14 14:39:22,042 - INFO: Delete Custom Script on Enea Edge Management
 2020-04-14 14:39:22,081 - DEBUG: Login successful on host '172.24.3.109'
 2020-04-14 14:39:22,082 - DEBUG: Session token is: f75a83a0-7e4c-11ea-835c-02423a1c239f
 2020-04-14 14:39:22,099 - DEBUG: Found custom script: 'test_success_after_always'
 2020-04-14 14:39:22,099 - DEBUG: Delete script test_success_after_always, \
-phase always-after-startup from uCPE Manager
+phase always-after-startup from Enea Edge Management
 2020-04-14 14:39:22,118 - INFO: Done
 2020-04-14 14:39:22,135 - DEBUG: Logging out and exiting...</programlisting>
       </section>
@@ -2355,10 +2355,10 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -c CUSTOMSCRIPTNAME, --customScriptName=CUSTOMSCRIPTNAME
                         Custom Script Name that resides on a Device
   -e PHASE, --phase=PHASE
@@ -2469,7 +2469,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
@@ -2477,7 +2477,7 @@ phase always-after-startup from inteld1521-6
 2020-04-14 14:08:02,915 - INFO: Upload Custom Script
 2020-04-14 14:08:02,994 - DEBUG: Login successful on host '172.24.3.109'
 2020-04-14 14:08:02,995 - DEBUG: Session token is: 97544990-7e48-11ea-835c-02423a1c239f
-2020-04-14 14:08:02,996 - DEBUG: Upload test_success_after_always to uCPE Manager. \
+2020-04-14 14:08:02,996 - DEBUG: Upload test_success_after_always to Enea Edge Management. \
 Content: #!/bin/bash
 echo test_success_after_always
 2020-04-14 14:08:03,138 - INFO: Done
@@ -2485,7 +2485,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,17 +2517,17 @@ 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
 2020-04-14 14:39:22,042 - DEBUG: Started logging
-2020-04-14 14:39:22,042 - INFO: Delete Custom Script on uCPE Manager
+2020-04-14 14:39:22,042 - INFO: Delete Custom Script on Enea Edge Management
 2020-04-14 14:39:22,081 - DEBUG: Login successful on host '172.24.3.109'
 2020-04-14 14:39:22,082 - DEBUG: Session token is: f75a83a0-7e4c-11ea-835c-02423a1c239f
 2020-04-14 14:39:22,099 - DEBUG: Found custom script: 'test_success_after_always'
 2020-04-14 14:39:22,099 - DEBUG: Delete script test_success_after_always, \
-phase always-after-startup from uCPE Manager
+phase always-after-startup from Enea Edge Management
 2020-04-14 14:39:22,118 - INFO: Done
 2020-04-14 14:39:22,135 - DEBUG: Logging out and exiting...</programlisting>
       </section>
@@ -2536,13 +2536,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 +2566,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 \
@@ -2599,10 +2599,10 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -s STORE, --store=STORE
                         Offline config store name
   -d DEVICE, --device=DEVICE
@@ -2645,10 +2645,10 @@ Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -d DEVICE, --device=DEVICE
                         Device Name
 
@@ -2670,15 +2670,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,23 +2689,23 @@ 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>
 
         <programlisting>python removeConfigStore.py -h
 Usage: removeConfigStore.py [options]
 
-Remove a config store from Enea uCPE Manager.
+Remove a config store from Enea Edge Management.
 
 Options:
   --version             show program's version number and exit
   -h, --help            show this help message and exit
   -u USERNAME, --username=USERNAME
-                        Enea uCPE Manager login username
+                        Enea Edge Management login username
   -p PASSWORD, --password=PASSWORD
-                        Enea uCPE Manager login password
-  -H HOST, --host=HOST  Enea uCPE Manager host name or IP address
+                        Enea Edge Management login password
+  -H HOST, --host=HOST  Enea Edge Management host name or IP address
   -o STORENAME, --store-name=STORENAME
                         Name of the Offline Config Store
 
@@ -2770,8 +2770,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-nfv-access-auto-fw-th-user-guide/doc/book.xml
index 0b96de2..6398606 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/book.xml
@@ -4,7 +4,7 @@
 <!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>
+  <title><trademark class="registered">Enea</trademark> Enea 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-nfv-access-auto-fw-th-user-guide/doc/components.xml
index 9b775a7..24a7a29 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/components.xml
+++ b/doc/book-enea-nfv-access-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 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 "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>
+        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>
@@ -85,14 +84,14 @@
     <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
+    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>
 
@@ -102,7 +101,7 @@
     <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>
+    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-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
index eee6636..97666cf 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/getting_started.xml
@@ -29,7 +29,7 @@
 
     <note>
       <para>The Automation Framework and Test Harness installation may be done
-      on the same machine used for uCPE Manager installation, although this is
+      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>
@@ -180,16 +180,16 @@
       </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",
-"ucpe_pass":"uCPE Manager Password",
-"ucpe_host":"uCPE Manager IP/Hostname",
+"ucpe_usr":"Enea Edge Management Username",
+"ucpe_pass":"Enea Edge Management Password",
+"ucpe_host":"Enea Edge Management IP/Hostname",
 "ftp_usr":"FTP Username",
 "ftp_pass":"FTP Password",
 "ftp_port":"FTP Port"
@@ -225,10 +225,10 @@
     <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
diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
index eadc1d5..b2486a0 100644
--- a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
+++ b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/overview.xml
@@ -3,21 +3,20 @@
   <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
+  Enea Edge, 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 +38,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>
@@ -66,7 +65,7 @@
           <row>
             <entry>AF</entry>
 
-            <entry>Automation Framework for Enea NFV Access.</entry>
+            <entry>Automation Framework for Enea Edge.</entry>
           </row>
 
           <row>
@@ -162,11 +161,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-nfv-access-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-nfv-access-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-auto-fw-th-user-guide/swcomp.mk b/doc/book-enea-nfv-access-auto-fw-th-user-guide/swcomp.mk
index 9f0a075..6b65cff 100755
--- 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
@@ -6,5 +6,5 @@ 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"
+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-nfv-access-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-nfv-access-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_4.xml b/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml
index 45689e5..0e207ae 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/appendix_4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <appendix id="appendix_four_cust">
-  <title>Running Enea Automation Framework tests</title>
+  <title>Running Enea Automation Framework and Test Harness</title>
 
   <para>For more detailed information regarding the Automation Framework and
   Test Harness please see the <xi:include
@@ -78,7 +78,7 @@
 
   <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
diff --git a/doc/book-enea-nfv-access-example-usecases/doc/appendix_5.xml b/doc/book-enea-nfv-access-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-nfv-access-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-nfv-access-example-usecases/doc/book.xml
index eb8b0c8..9879c28 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/book.xml
+++ b/doc/book-enea-nfv-access-example-usecases/doc/book.xml
@@ -4,7 +4,7 @@
 <!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>
+  <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-nfv-access-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-nfv-access-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-nfv-access-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-nfv-access-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-nfv-access-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-nfv-access-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/introduction.xml b/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml
index fc3559b..b502e8b 100644
--- a/doc/book-enea-nfv-access-example-usecases/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-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-nfv-access-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-nfv-access-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-nfv-access-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-nfv-access-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-example-usecases/swcomp.mk b/doc/book-enea-nfv-access-example-usecases/swcomp.mk
index 972746a..5f5ab16 100755
--- a/doc/book-enea-nfv-access-example-usecases/swcomp.mk
+++ b/doc/book-enea-nfv-access-example-usecases/swcomp.mk
@@ -6,5 +6,5 @@ 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"
+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-nfv-access-getting-started/doc/advanced_configurations.xml
index cb0ae5b..70a9978 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/advanced_configurations.xml
@@ -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>
 
@@ -422,11 +418,12 @@ node0.1048576kB = 3 </programlisting>
   </section>
 
   <section 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-nfv-access-getting-started/doc/book.xml
index fa3fc4f..0704dd0 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/book.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/book.xml
@@ -4,7 +4,7 @@
 <!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>
+  <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-nfv-access-getting-started/doc/grafana.xml
index 0da3855..9fc9a27 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/grafana.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/grafana.xml
@@ -1,102 +1,103 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="grafana">
   <title>Using Grafana and InfluxDB</title>
-  
-  <para>InfluxDB is essentially a time series database process that runs on a 
-    server, while Grafana is a visualization tool for time series data. 
-    Grafana is a very lightweight server-side application, and most of the 
-    monitoring runs in a browser.</para>
+
+  <para>InfluxDB is essentially a time series database process that runs on a
+  server, while Grafana is a visualization tool for time series data. Grafana
+  is a very lightweight server-side application, and most of the monitoring
+  runs in a browser.</para>
 
   <section id="telemetry_deployment">
     <title>Deploying Grafana and InfluxDB</title>
-    
-    <para>Grafana and InfluxDB can be deployed using images for Docker on linux. 
-      These images are provided by Enea along with a deploy script and 
-      predefined dashboards.</para>
-      
-     <para>The Grafana and InfluxDB images can be deployed on the same machine 
-       or on separate machines.</para>
+
+    <para>Grafana and InfluxDB can be deployed using images for Docker on
+    linux. These images are provided by Enea along with a deploy script and
+    predefined dashboards.</para>
+
+    <para>The Grafana and InfluxDB images can be deployed on the same machine
+    or on separate machines.</para>
 
     <section id="prereq_deploy">
-    <title>Prerequisites for Deploying an Image</title>
-      
+      <title>Prerequisites for Deploying an Image</title>
+
       <para>The following must be present in order to deploy an image:</para>
-    
-        <itemizedlist>
-          <listitem>
-            <para>CentOS 7 Linux.</para>
-          </listitem>
-          
-          <listitem>
-            <para>Docker for CentOS 7 installed on the machine and set to 
-              <literal>autostart</literal> as a service.</para>
-          </listitem>
-          
-          <listitem>
-            <para>Superuser rights on the CentOS 7 machine.</para>
-          </listitem>
-        </itemizedlist>
-     </section>
-     
+
+      <itemizedlist>
+        <listitem>
+          <para>CentOS 7 Linux.</para>
+        </listitem>
+
+        <listitem>
+          <para>Docker for CentOS 7 installed on the machine and set to
+          <literal>autostart</literal> as a service.</para>
+        </listitem>
+
+        <listitem>
+          <para>Superuser rights on the CentOS 7 machine.</para>
+        </listitem>
+      </itemizedlist>
+    </section>
+
     <section id="deploy_steps">
       <title>Deploying Grafana and InfluxDB</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 
-            <filename>Enea_NFV_Access_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>
-          </listitem>
-          
-          <listitem>
-            <para>Enter <literal>&lt;Telemetry-installdir&gt;</literal>.</para>
-          </listitem>
-          
-          <listitem>
-            <para>Run the provided <filename>telemetry_deploy.sh</filename> script.</para>
-          </listitem>
-          
-          <listitem>
-            <para>When prompted, select what images you want to deploy.</para>
-            
-            <para>If an image is already deployed, you will be prompted to replace it.</para>
-          </listitem>
-          
-          <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>
-            
-            <note>
-               <para>Changing the InfluxDB username and password requires redeploying 
-                 the InfluxDB image.</para>
-            </note>
-          </listitem>
-          
-          <listitem>
-           <para>Verify the installation by running the command <literal>docker ps -a</literal>.
-           The Grafana and InfluxDB containers should be present and have
-           the status <literal>Up</literal>.
-           </para>
-          </listitem>
-        </orderedlist>
-      </section>
+
+      <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
+          <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>
+        </listitem>
+
+        <listitem>
+          <para>Enter <literal>&lt;Telemetry-installdir&gt;</literal>.</para>
+        </listitem>
+
+        <listitem>
+          <para>Run the provided <filename>telemetry_deploy.sh</filename>
+          script.</para>
+        </listitem>
+
+        <listitem>
+          <para>When prompted, select what images you want to deploy.</para>
+
+          <para>If an image is already deployed, you will be prompted to
+          replace it.</para>
+        </listitem>
+
+        <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 Edge Management for Telemetry.</para>
+
+          <note>
+            <para>Changing the InfluxDB username and password requires
+            redeploying the InfluxDB image.</para>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>Verify the installation by running the command <literal>docker
+          ps -a</literal>. The Grafana and InfluxDB containers should be
+          present and have the status <literal>Up</literal>.</para>
+        </listitem>
+      </orderedlist>
     </section>
+  </section>
 
   <section id="grafana_settings">
     <title>Setting Grafana and InfluxDB parameters</title>
 
     <para>Customizing InfluxDB and Grafana parameters can be done by selecting
-    <emphasis role="bold">System</emphasis>, then the <emphasis role="bold">Configuration</emphasis> 
-      menu, accessing the <emphasis role="bold">Properties</emphasis> tab, and clicking on the 
-      <emphasis role="bold">Telemetry</emphasis> tab. The settings that can be changed
-    are listed in the table below:</para>
+    <emphasis role="bold">System</emphasis>, then the <emphasis
+    role="bold">Configuration</emphasis> menu, accessing the <emphasis
+    role="bold">Properties</emphasis> tab, and clicking on the <emphasis
+    role="bold">Telemetry</emphasis> tab. The settings that can be changed are
+    listed in the table below:</para>
 
     <table>
       <title>Telemetry settings</title>
@@ -138,7 +139,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>
@@ -183,8 +184,8 @@
     </table>
 
     <para>When changing any of the settings in the <emphasis
-    role="bold">Telemetry</emphasis> tab, the Enea uCPE Manager will inform all
-    uCPE devices of the change if they have telemetry running.</para>
+    role="bold">Telemetry</emphasis> tab, the Enea Edge Management will inform
+    all uCPE devices of the change if they have telemetry running.</para>
 
     <figure>
       <title>Telemetry Properties</title>
@@ -203,11 +204,11 @@
 
     <para>When a uCPE Device is selected, in the <emphasis
     role="bold">Operations</emphasis> menu, the <emphasis role="bold">Start
-    Telemetry</emphasis> and <emphasis role="bold">Stop
-    Telemetry</emphasis> options are available.</para>
+    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 sends
-    the following information about the InfluxDB:</para>
+    <para>When starting Telemetry for a uCPE device, the Enea Edge Management
+    sends the following information about the InfluxDB:</para>
 
     <itemizedlist>
       <listitem>
@@ -226,10 +227,10 @@
     </itemizedlist>
 
     <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>. The password is sent 
-      encrypted using the Base64 scheme.</para>
+    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>. The
+    password is sent encrypted using the Base64 scheme.</para>
 
     <figure>
       <title>Telemetry Start Dialog</title>
@@ -241,25 +242,25 @@
       </mediaobject>
     </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 
-      <emphasis role="bold">Event</emphasis> menu.</para>
+    <para>When the Telemetry status is changed on a uCPE device, a
+    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>
 
   <section id="grafana_launch">
     <title>Launching Grafana</title>
 
     <para>When a uCPE Device is selected, the <emphasis
-    role="bold">Telemetry</emphasis> button is available. Pressing this
-    button will open a new window pointing to Grafana. The current uCPE device will
+    role="bold">Telemetry</emphasis> button is available. Pressing this button
+    will open a new window pointing to Grafana. The current uCPE device will
     be selected in Grafana.</para>
 
     <para>The hostname or IP Address and the port of the Grafana installation
-    can be customized by selecting <emphasis role="bold">System</emphasis>, then the 
-      <emphasis role="bold">Configuration</emphasis> menu, accessing the 
-      <emphasis role="bold">Properties</emphasis> tab, and clicking on the 
-      <emphasis role="bold">Telemetry</emphasis> tab. The default dashboard available when
-      launching Grafana can be customized as well.</para>
+    can be customized by selecting <emphasis role="bold">System</emphasis>,
+    then the <emphasis role="bold">Configuration</emphasis> menu, accessing
+    the <emphasis role="bold">Properties</emphasis> tab, and clicking on the
+    <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
diff --git a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml b/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
index be4342f..f8da56d 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/installation_guide.xml
@@ -1,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,7 @@ sudo systemctl mask now firewalld</programlisting>
 
               <entry>UDP</entry>
 
-              <entry>Required for the Enea uCPE Manager High Availability
+              <entry>Required for the Enea Edge Management High Availability
               Configuration.</entry>
             </row>
 
@@ -198,7 +195,7 @@ sudo systemctl mask now firewalld</programlisting>
 
               <entry>TCP</entry>
 
-              <entry>Required for the Enea uCPE Manager High Availability
+              <entry>Required for the Enea Edge Management High Availability
               Configuration.</entry>
             </row>
 
@@ -223,7 +220,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 +231,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>
@@ -299,8 +296,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 +321,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 +353,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 +374,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 +385,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 +401,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 +431,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,14 +456,14 @@ 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>
@@ -474,7 +471,7 @@ userdel postgres</programlisting>
         <orderedlist>
           <listitem>
             <para>Extract
-            <literal>Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
+            <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>
@@ -510,8 +507,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>
@@ -590,13 +587,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
@@ -619,8 +616,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>
@@ -631,8 +628,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>
@@ -645,47 +642,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 \
@@ -694,11 +692,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
@@ -706,7 +704,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>
@@ -760,16 +758,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>
@@ -852,24 +850,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. This can be
+              <para>The static Enea Edge Management IP Address. 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>
@@ -885,7 +883,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>
@@ -905,7 +903,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>
 
@@ -918,10 +916,10 @@ 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>
@@ -953,13 +951,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>
@@ -969,14 +967,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>
@@ -990,8 +988,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>
 
@@ -1003,14 +1001,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>
@@ -1024,7 +1022,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>
@@ -1037,8 +1035,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>
 
@@ -1052,7 +1050,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>
 
@@ -1096,8 +1094,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>
 
@@ -1108,12 +1106,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"
@@ -1125,14 +1124,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
@@ -1141,15 +1141,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>
@@ -1167,9 +1167,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-nfv-access-getting-started/doc/introduction.xml
index 5f8a5ad..4dec1e1 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-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,32 @@
   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
+    <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 +58,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 +87,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 +141,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 +164,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-nfv-access-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-nfv-access-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-nfv-access-getting-started/doc/net_config_options.xml
index f610651..65dfb2b 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/net_config_options.xml
@@ -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-nfv-access-getting-started/doc/troubleshooting.xml
index f416f8f..4984a35 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-nfv-access-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-nfv-access-getting-started/doc/upgrade_ena.xml
index 1b714f2..e833c2d 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/upgrade_ena.xml
@@ -1,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>
@@ -57,7 +56,7 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
 
         <note>
           <para>The snapshot file created during the upgrade can be used for
-          restoring the Enea uCPE Manager.</para>
+          restoring the Enea Edge Management.</para>
         </note>
       </listitem>
 
@@ -71,24 +70,25 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
       </listitem>
     </itemizedlist>
 
-    <para>For an example on how to upgrade an Enea uCPE Manager installation in a
-    High Availability setup, consult <olink
+    <para>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
-    <ns:include href="../../s_docbuild/olinkdb/pardoc-names.xml"
-    xpointer="element(book_enea_nfv_access_getting_started/1)"
-    xmlns:ns="http://www.w3.org/2001/XInclude" /></olink> Manual.</para>
+    <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>
 
     <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>
@@ -99,8 +99,8 @@ Enea_NFV_Access_uCPEManager_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</pr
         <listitem>
           <para>Copy the snapshot file
           (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>)
-          created during a previous Enea uCPE Manager Upgrade or Enea uCPE
-          Manager Uninstall Operation into the
+          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>
 
@@ -110,8 +110,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>
@@ -126,9 +126,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>
 
@@ -137,21 +137,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 is
+          <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>
@@ -174,7 +175,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>
 
@@ -193,7 +194,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>
@@ -201,7 +202,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">
@@ -266,7 +267,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>
 
@@ -362,7 +363,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>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml b/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
index e8c65eb..fbf7091 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/vnf_mg.xml
@@ -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,32 +109,35 @@
     </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>
 
         <listitem>
-          <para>When prompted by the UI, make sure the <emphasis role="bold">VM
-          Image</emphasis> radio button at the top of the onboarding screen is
-          selected, it will trigger a popup menu window.</para>
+          <para>When prompted by the UI, make sure the <emphasis
+          role="bold">VM Image</emphasis> radio button at the top of the
+          onboarding screen is selected, it will trigger a popup menu
+          window.</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>
@@ -153,8 +156,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>
@@ -171,7 +174,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>
@@ -203,14 +206,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
@@ -219,9 +222,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>
@@ -273,7 +276,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
@@ -292,9 +295,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>
 
@@ -349,8 +352,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>
@@ -406,13 +409,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">
@@ -425,8 +429,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>
@@ -440,12 +445,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>
 
diff --git a/doc/book-enea-nfv-access-getting-started/swcomp.mk b/doc/book-enea-nfv-access-getting-started/swcomp.mk
index ca6439f..52b433e 100755
--- a/doc/book-enea-nfv-access-getting-started/swcomp.mk
+++ b/doc/book-enea-nfv-access-getting-started/swcomp.mk
@@ -6,5 +6,5 @@ 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"
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Getting Started"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/about.xml b/doc/book-enea-nfv-access-platform-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-nfv-access-platform-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-platform-open-source/doc/book.xml b/doc/book-enea-nfv-access-platform-open-source/doc/book.xml
index a17bb3d..1150b11 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/book.xml
+++ b/doc/book-enea-nfv-access-platform-open-source/doc/book.xml
@@ -4,7 +4,7 @@
 <!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>
+  <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-nfv-access-platform-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-nfv-access-platform-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-nfv-access-platform-open-source/swcomp.mk b/doc/book-enea-nfv-access-platform-open-source/swcomp.mk
index fc62acc..20202e4 100644
--- a/doc/book-enea-nfv-access-platform-open-source/swcomp.mk
+++ b/doc/book-enea-nfv-access-platform-open-source/swcomp.mk
@@ -6,5 +6,5 @@ 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"
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge Runtime Open Source Report"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-release-info/doc/about_release.xml b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
index 2078a30..960f136 100644
--- a/doc/book-enea-nfv-access-release-info/doc/about_release.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
@@ -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-nfv-access-release-info/doc/book.xml
index 4a1e390..cffe9b5 100644
--- a/doc/book-enea-nfv-access-release-info/doc/book.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/book.xml
@@ -4,7 +4,7 @@
 <!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
+  <title><trademark class="registered">Enea</trademark> Edge Release
   Information</title>
 
   <subtitle>Release Version
diff --git a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
index 31d3a03..d71deff 100644
--- a/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
@@ -9,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>
@@ -58,33 +57,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 update glib2</literal>.</para>
@@ -101,8 +100,8 @@
     </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 
+      <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>
     
@@ -125,14 +124,14 @@
 
     <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 common-name 
+	  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>
 	  
 	  <para>Perform the following the steps to generate the certificate:</para>
 	  
 	  <orderedlist>
-		<listitem><para>Stop the uCPE Manager service.</para></listitem>
+		<listitem><para>Stop the Enea Edge Management service.</para></listitem>
 		
 		<listitem><para>Create the certificate using the 
                   <filename>createCertificate.sh</filename> script from distribution 
@@ -141,7 +140,7 @@
 		<literal>/opt/ems/ucpemanager/application/3rdParty/apache-tomcat/conf/config/certificates</literal> 
 		folder.</para></listitem>
 		
-		<listitem><para>Start the Enea uCPE Manager, the new certificate 
+		<listitem><para>Start the Enea Edge Management, the new certificate 
                   should now take effect.</para></listitem>
 	  </orderedlist>
     </listitem>
diff --git a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
index 10faf28..c01a149 100644
--- a/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
@@ -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,22 +26,22 @@
 
       <listitem>
         <para><remark>CPDX-3498</remark>High Availability support with redundant 
-		Enea uCPE Managers in active standby configuration.</para>		
+		Enea Edge Management in active standby configuration.</para>		
       </listitem>
 
       <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"
@@ -50,7 +49,7 @@
         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>
+        are deprecated starting with Enea Edge 2.4.0.</para>
       </listitem>	  
     </itemizedlist>
 
@@ -85,15 +84,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>
@@ -117,39 +116,39 @@
     <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"
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xpointer="element(book_enea_nfv_access_platform_open_source/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
       </listitem>
 
       <listitem>
-        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xpointer="element(book_enea_nfv_access_ucpem_open_source/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
       </listitem>
 	  
 	  <listitem>
-        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xpointer="element(book_enea_nfv_access_telemetry_open_source/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
       </listitem>
 
       <listitem>
-        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xpointer="element(book_enea_nfv_access_auto_fw_open_source/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
       </listitem>
 
       <listitem>
-        <para><ns:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
+        <para><xi:include href="../../s_docbuild/olinkdb/pardoc-common.xml"
         xpointer="element(book_enea_nfv_access_auto_fw_th_open_source/1)"
-        xmlns:ns="http://www.w3.org/2001/XInclude" />.</para>
+        xmlns:xi="http://www.w3.org/2001/XInclude" />.</para>
       </listitem>	  
     </itemizedlist>
   </section>
diff --git a/doc/book-enea-nfv-access-release-info/swcomp.mk b/doc/book-enea-nfv-access-release-info/swcomp.mk
index 3ba7c8d..76991ee 100644
--- a/doc/book-enea-nfv-access-release-info/swcomp.mk
+++ b/doc/book-enea-nfv-access-release-info/swcomp.mk
@@ -6,5 +6,5 @@ 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"
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) Release Information"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-system-test-specification/doc/book.xml b/doc/book-enea-nfv-access-system-test-specification/doc/book.xml
index 2620554..9192ef5 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/book.xml
+++ b/doc/book-enea-nfv-access-system-test-specification/doc/book.xml
@@ -4,7 +4,7 @@
 <!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>
+  <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-nfv-access-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-nfv-access-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-nfv-access-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-nfv-access-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-nfv-access-system-test-specification/doc/sample_test_cases.xml
index 2fa087b..b1bfa1e 100644
--- a/doc/book-enea-nfv-access-system-test-specification/doc/sample_test_cases.xml
+++ b/doc/book-enea-nfv-access-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-system-test-specification/swcomp.mk b/doc/book-enea-nfv-access-system-test-specification/swcomp.mk
index aea86ca..6e08a56 100755
--- a/doc/book-enea-nfv-access-system-test-specification/swcomp.mk
+++ b/doc/book-enea-nfv-access-system-test-specification/swcomp.mk
@@ -6,5 +6,5 @@ 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"
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge $(PROD_VER) System Test Specification"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-telemetry-open-source/doc/about.xml b/doc/book-enea-nfv-access-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-nfv-access-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-telemetry-open-source/doc/book.xml b/doc/book-enea-nfv-access-telemetry-open-source/doc/book.xml
index b005dae..c671fd7 100644
--- a/doc/book-enea-nfv-access-telemetry-open-source/doc/book.xml
+++ b/doc/book-enea-nfv-access-telemetry-open-source/doc/book.xml
@@ -4,7 +4,7 @@
 <!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>
+  <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/swcomp.mk b/doc/book-enea-nfv-access-telemetry-open-source/swcomp.mk
index 0314da2..332d0c8 100644
--- a/doc/book-enea-nfv-access-telemetry-open-source/swcomp.mk
+++ b/doc/book-enea-nfv-access-telemetry-open-source/swcomp.mk
@@ -6,5 +6,5 @@ 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"
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge Telemetry Open Source Report"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-ucpem-open-source/doc/about.xml b/doc/book-enea-nfv-access-ucpem-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-nfv-access-ucpem-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-nfv-access-ucpem-open-source/doc/book.xml
index d140047..7401818 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/doc/book.xml
+++ b/doc/book-enea-nfv-access-ucpem-open-source/doc/book.xml
@@ -4,7 +4,7 @@
 <!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>
+  <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/swcomp.mk b/doc/book-enea-nfv-access-ucpem-open-source/swcomp.mk
index 15d7a6d..a7e39ab 100644
--- a/doc/book-enea-nfv-access-ucpem-open-source/swcomp.mk
+++ b/doc/book-enea-nfv-access-ucpem-open-source/swcomp.mk
@@ -6,5 +6,5 @@ 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"
+BOOKDESC_$(BOOKPACKAGES) := "Enea Edge Management Open Source Report"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
-- 
cgit v1.2.3-54-g00ecf