6 files changed, 237 insertions, 239 deletions

diff --git a/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml b/doc/book-enea-nfv-access-auto-fw-th-user-guide/doc/automation_framework_test_harness.xml
index 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>