9 files changed, 30 insertions, 30 deletions

diff --git a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
index f52e33d..4d30ff6 100644
--- a/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
+++ b/doc/book-enea-edge-example-usecases/doc/appendix_4.xml
@@ -93,7 +93,7 @@
   <para>To run a test:</para>
 
   <programlisting>&gt; cd automation_framework/unittestSuite/
-&gt; python unittestSuite.py -u admin -p admin -H &lt;uCPEManager IP address&gt; -n \
+&gt; python unittestSuite.py -u admin -p admin -H &lt;EneaEdgeManagement IP address&gt; -n \
 &lt;uCPE Device name&gt; -s &lt;Test suite&gt; -d &lt;description&gt;</programlisting>
 
   <para>The <literal>Test suite</literal> must be one from any of the
diff --git a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
index c387e7f..bea8610 100644
--- a/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
+++ b/doc/book-enea-edge-getting-started/doc/advanced_configurations.xml
@@ -427,11 +427,11 @@ node0.1048576kB = 3 </programlisting>
           <para>Extract <literal>Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</literal></para>
 
           <para>The directory in which the archive has been unpacked will be
-          denoted as: <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+          denoted as: <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
         </listitem>
 
         <listitem>
-          <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+          <para>Enter <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
         </listitem>
 
         <listitem>
@@ -840,7 +840,7 @@ galera-4-26.4.6-1.el7.centos.x86_64</programlisting>
 #wsrep_provider_options=
 
 # Logical cluster name. Should be the same for all nodes.
-<emphasis role="bold">wsrep_cluster_name="ucpemanager"</emphasis>
+<emphasis role="bold">wsrep_cluster_name="EneaEdgeManagement"</emphasis>
 
 # Group communication system handle
 <emphasis role="bold">wsrep_cluster_address="gcomm://192.168.10.11,192.168.10.12,..,192.168.10.16"</emphasis>
@@ -945,11 +945,11 @@ Thanks for using MariaDB!</programlisting>
             <para>Create the initial database and grant access to it:</para>
 
             <programlisting>[root@localhost application]# mysql --host=localhost --user=root -p
-MariaDB [(none)]&gt; CREATE DATABASE ucpemanager CHARACTER SET='utf8' \
+MariaDB [(none)]&gt; CREATE DATABASE EneaEdgeManagement CHARACTER SET='utf8' \
 COLLATE='utf8_bin';
 Query OK, 1 row affected (0.004 sec)
 
-MariaDB [(none)]&gt; GRANT ALL PRIVILEGES ON ucpemanager.* \
+MariaDB [(none)]&gt; GRANT ALL PRIVILEGES ON EneaEdgeManagement.* \
 TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
           </listitem>
         </orderedlist>
@@ -989,7 +989,7 @@ TO 'enea'@'%' IDENTIFIED BY 'somepassword' WITH GRANT OPTION;</programlisting>
         Management application, and run:</para>
 
         <programlisting>[root@localhost distro]#./install.sh /opt/ \
-Enea_NFV_Access_uCPEManager_2.3.0-build23.tar.gz
+Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz
 This will install the Enea Edge Management application into the /opt/ucpemanager folder.
 Select the following options, while asked by the installation script:
 Are you using the embedded PostgreSQL database? [Y/N]: <emphasis role="bold">N</emphasis>
@@ -1008,12 +1008,12 @@ Creating database configuration file \
 Done .
 …
 Installing ucpemanager service ..
-Specify service username [ucpemanager]: 
-Specify service password [ucpemanager]: somepassword
+Specify service username [EneaEdgeManagement]: 
+Specify service password [EneaEdgeManagement]: somepassword
 …
 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]: 
+Specify the name of the cluster [EneaEdgeManagement]: 
 Specify the shared (virtual) cluster IP address: <emphasis role="bold">192.168.10.10</emphasis>
 Specify the netmask for the cluster IP address [255.255.255.0]: 
 Specify the IP address of the (optional) arbiter: <emphasis role="bold">192.168.10.13</emphasis>
diff --git a/doc/book-enea-edge-getting-started/doc/installation_guide.xml b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
index b4324de..55cc867 100644
--- a/doc/book-enea-edge-getting-started/doc/installation_guide.xml
+++ b/doc/book-enea-edge-getting-started/doc/installation_guide.xml
@@ -479,12 +479,12 @@ userdel postgres</programlisting>
             <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-installerdir&gt;</literal>.</para>
+            denoted as: <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
           </listitem>
 
           <listitem>
             <para>Enter
-            <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+            <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
           </listitem>
 
           <listitem>
@@ -695,7 +695,7 @@ Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programli
           GUI (<filename>SystemBackup_MMMDD_YYYY_HHMM_SS.zip</filename>) is
           different from the snapshot obtained during an Enea Edge Management
           Upgrade or Uninstall operation
-          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
+          (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>) needed
           for recovery of the Enea Edge Management application. For more
           details, see <olink targetdoc="book_enea_edge_getting_started"
           targetptr="restore_prev_ucpe_install">Restoring a previous Enea Edge
diff --git a/doc/book-enea-edge-getting-started/doc/troubleshooting.xml b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
index fcf991e..3145f32 100644
--- a/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
+++ b/doc/book-enea-edge-getting-started/doc/troubleshooting.xml
@@ -96,7 +96,7 @@
 
           <entry>If a working snapshot obtained during a previous Upgrade or
           Uninstall is available
-          (<filename>ucpemanager-Backup-YYYYddMMHHmm.tar.gz</filename>):
+          (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>):
           <orderedlist>
               <listitem>
                 <para>Cleanup the current upgrade attempt with:</para>
diff --git a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
index e213a0f..7c9c1f9 100644
--- a/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
+++ b/doc/book-enea-edge-getting-started/doc/upgrade_ena.xml
@@ -24,11 +24,11 @@
         folder.</para>
 
         <para>The directory in which the archive has been unpacked will be
-        denoted as <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+        denoted as <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
       </listitem>
 
       <listitem>
-        <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+        <para>Enter <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
       </listitem>
 
       <listitem>
@@ -54,7 +54,7 @@ Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programli
         application folder
         (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>), which
         contains a snapshot of the existing installation in the
-        <literal>&lt;uCPEM-installerdir&gt;/dist</literal> directory.</para>
+        <literal>&lt;EEMg-installerdir&gt;/dist</literal> directory.</para>
 
         <note>
           <para>The snapshot file created during the upgrade can be used for
@@ -104,7 +104,7 @@ Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programli
 
         <listitem>
           <para>The directory in which the archive has been unpacked will be
-          denoted as <literal>&lt;uCPEM-installerdir&gt;</literal>.</para>
+          denoted as <literal>&lt;EEMg-installerdir&gt;</literal>.</para>
         </listitem>
 
         <listitem>
@@ -112,11 +112,11 @@ Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programli
           (<filename>EneaEdgeManagement-Backup-YYYYddMMHHmm.tar.gz</filename>)
           created during a previous Enea Edge Management Upgrade or Enea Edge
           Management Uninstall Operation into the
-          <literal>&lt;uCPEM-installerdir&gt;/dist</literal> directory.</para>
+          <literal>&lt;EEMg-installerdir&gt;/dist</literal> directory.</para>
         </listitem>
 
         <listitem>
-          <para>Enter <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+          <para>Enter <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
         </listitem>
 
         <listitem>
@@ -158,12 +158,12 @@ Enea_Edge_Management_&lt;version&gt;-build&lt;build_number&gt;.tar.gz</programli
         <listitem>
           <para>Navigate to the folder where the Enea Edge Management
           application is unpacked:
-          <filename>&lt;uCPEM-installerdir&gt;</filename>.</para>
+          <filename>&lt;EEMg-installerdir&gt;</filename>.</para>
         </listitem>
         
         <listitem>
           <para>Enter
-          <literal>&lt;uCPEM-installerdir&gt;/dist</literal>.</para>
+          <literal>&lt;EEMg-installerdir&gt;/dist</literal>.</para>
         </listitem>
 
         <listitem>
diff --git a/doc/book-enea-edge-management-open-source/doc/README b/doc/book-enea-edge-management-open-source/doc/README
index 1077acb..cb17733 100644
--- a/doc/book-enea-edge-management-open-source/doc/README
+++ b/doc/book-enea-edge-management-open-source/doc/README
@@ -1,4 +1,4 @@
-The licenses.xml in the git repository of Enea NFV Access Open Source Report
-is the frozen version belonging to the last official release of Enea NFV Access.
+The licenses.xml in the git repository of the Enea Edge Open Source Report
+is the frozen version belonging to the last official release of Enea Edge.
 The contents must be generated from the release script to obtain the latest
 lists of packages and licenses.
diff --git a/doc/book-enea-edge-runtime-open-source/doc/README b/doc/book-enea-edge-runtime-open-source/doc/README
index 607ce67..6aeccc9 100644
--- a/doc/book-enea-edge-runtime-open-source/doc/README
+++ b/doc/book-enea-edge-runtime-open-source/doc/README
@@ -1,4 +1,4 @@
-The licenses.xml in the git repository of Enea NFV Access Runtime Platform Open Source Report
-is the frozen version belonging to the last official release of Enea NFV Access.
+The licenses.xml in the git repository of the Enea Edge Runtime Platform Open Source Report
+is the frozen version belonging to the last official release of Enea Edge.
 The contents must be generated from the release script to obtain the latest
-lists of packages and licenses.
+lists of packages and licenses.
\ No newline at end of file
diff --git a/doc/book-enea-edge-runtime-open-source/doc/licenses.xml b/doc/book-enea-edge-runtime-open-source/doc/licenses.xml
index 6f9aa06..45e6076 100644
--- a/doc/book-enea-edge-runtime-open-source/doc/licenses.xml
+++ b/doc/book-enea-edge-runtime-open-source/doc/licenses.xml
@@ -1786,7 +1786,7 @@ specific documentation.-->
 <row>
  <entry>ntp-user-stub</entry>
  <entry>1.0</entry>
- <entry>The NTP user/group were added in previous NFVA releases and are needed for OSTree upgrades to ensure backwards compatibility.</entry>
+ <entry>The NTP user/group were added in previous Enea Edge releases and are needed for OSTree upgrades to ensure backwards compatibility.</entry>
  <entry>Enea</entry>
 </row>
 <row>
diff --git a/doc/book-enea-edge-telemetry-open-source/doc/README b/doc/book-enea-edge-telemetry-open-source/doc/README
index 1077acb..e5cb471 100644
--- a/doc/book-enea-edge-telemetry-open-source/doc/README
+++ b/doc/book-enea-edge-telemetry-open-source/doc/README
@@ -1,4 +1,4 @@
-The licenses.xml in the git repository of Enea NFV Access Open Source Report
-is the frozen version belonging to the last official release of Enea NFV Access.
+The licenses.xml in the git repository of Enea Edge Open Source Report
+is the frozen version belonging to the last official release of Enea Edge.
 The contents must be generated from the release script to obtain the latest
 lists of packages and licenses.