GettingStarted: use unified terms

- Use "uCPE device" to refer to target/board/host
- Use Enea NFV Access Run Time Platform in all documentations
- Add Definitions and Acronyms

Change-Id: I4347baf9fa74b40bc6297edeea1b2cd45d373485
Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>

6 files changed, 200 insertions, 126 deletions

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 5943980..1f51d01 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/book.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/book.xml
@@ -18,6 +18,9 @@
   <xi:include href="introduction.xml"
               xmlns:xi="http://www.w3.org/2001/XInclude" />                               
 
+  <xi:include href="definitions_and_acronyms.xml"
+              xmlns:xi="http://www.w3.org/2001/XInclude" />
+
   <xi:include href="getting_started_nfv_access.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
                           
diff --git a/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml b/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml
new file mode 100644
index 0000000..38c71b8
--- /dev/null
+++ b/doc/book-enea-nfv-access-getting-started/doc/definitions_and_acronyms.xml
@@ -0,0 +1,78 @@
+<?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="def_and_acr">
+  <title>Definitions and Acronyms</title>
+
+  <section id="definitions">
+    <title>Definitions</title>
+
+    <table>
+      <title>Definitions</title>
+
+      <tgroup cols="2">
+        <colspec align="left" colname="1" colwidth="1*" />
+
+        <colspec align="left" colname="2" colwidth="3*" />
+
+        <tbody>
+          <row>
+            <entry>Enea NFV Access</entry>
+
+            <entry>The Enea NFV Access Run Time Platform (with ODM) and uCPE
+            Manager.</entry>
+          </row>
+
+          <row>
+            <entry>Enea NFV Access Run Time Platform</entry>
+            <entry>A lightweight, multi-architecture virtualization platform,
+            supporting Virtual Machines (KVM / QEMU).</entry>
+          </row>
+
+          <row>
+            <entry>Enea uCPE Manager</entry>
+            <entry>Enea Universal Customer Premises Equipment Manager.</entry>
+          </row>
+
+          <row>
+            <entry>uCPE device</entry>
+            <entry>A whitebox (e.g. Intel XeonD) running Enea NFV Access Run
+            Time platform.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </section>
+
+  <section id="acronyms">
+    <title>Acronyms</title>
+
+    <table>
+      <title>acronyms</title>
+
+      <tgroup cols="2">
+        <colspec align="left" colname="1" colwidth="1*" />
+
+        <colspec align="left" colname="2" colwidth="3*" />
+
+        <tbody>
+          <row>
+            <entry>ODM</entry>
+            <entry>On Device Management.</entry>
+          </row>
+
+          <row>
+            <entry>OVS</entry>
+            <entry>Open vSwitch.</entry>
+          </row>
+
+          <row>
+            <entry>VIM</entry>
+
+            <entry>Virtual Infrastructure Manager.</entry>
+          </row>
+        </tbody>
+      </tgroup>
+    </table>
+  </section>
+</chapter>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
index 8aa1aeb..1fb5b1c 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/device_configuration_and_provisioning.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <chapter id="configuration_provision">
   <title>Device Configuration and Provisioning</title>
 
@@ -6,16 +6,16 @@
     <title>Manual Configuration</title>
 
     <para>This section describes how to connect to an instance of NFV Access
-    installed on a specific target, and how to setup the virtual
+    installed on a specific uCPE device, and how to setup the virtual
     infrastructure manually.</para>
 
-    <para><emphasis role="bold">How to add a board to the management system
+    <para><emphasis role="bold">How to add a uCPE device to the management system
     </emphasis></para>
 
-    <para>Add the boards running NFV Access to the management system. This is
+    <para>Add the uCPE device running NFV Access Run Time Platform to the management system. This is
     done by using the <literal>Devices -&gt; Manage -&gt; Add</literal> menu.
-    Supply information about the board running NFV Access, and set the
-    parameters that will be used to connect to the board. The relevant
+    Supply information about the uCPE device, and set the
+    parameters that will be used to connect to the uCPE device. The relevant
     parameters are described below:</para>
 
     <itemizedlist>
@@ -66,8 +66,9 @@
       <listitem>
         <para>Device Calls Home. This checkbox indicates the direction of
         device communications. In the Manual Configuration, leave this box
-        blank. For more info about how to add a device please refer to
-      <link linkend="adding_a_device">Zero Touch Provisioning, Adding a Device</link>.</para>
+        blank. For more info about how to add a device please refer to <link
+        linkend="adding_a_device">Zero Touch Provisioning, Adding a
+        Device</link>.</para>
       </listitem>
     </itemizedlist>
 
@@ -84,9 +85,10 @@
   <section id="host_int_net_config">
     <title>Host Interfaces and Network Configuration</title>
 
-    <para>The uCPE Manager can list network interfaces found on a device
-    (Device -&gt; Configuration -&gt; OpenVSwitch -&gt; Host Interface
-    Caps):</para>
+    <para>The uCPE Manager can list network interfaces found on a device by
+    selecting: <literal>Device</literal> -&gt;
+    <literal>Configuration</literal> -&gt; <literal>OpenVSwitch
+    </literal>-&gt; <literal>Host Interface Caps</literal>:</para>
 
     <figure>
       <title>Host Interface Caps</title>
@@ -108,9 +110,9 @@
       <para>Configuring a physical interface in DPDK mode will require a
       DPDK-based application (e.g. OVS-DPDK) in order to access and use the
       interface. An interface set as DPDK can be attached to an OVS-DPDK
-      bridge. Select the device, then the Configuration option from the top
-      toolbar: <literal>Configuration</literal>-&gt;<literal>OpenVSwitch
-      </literal>-&gt;<literal>Host Interfaces</literal>-&gt;<literal>
+      bridge. Select the uCPE device, then from the top toolbar select:
+      <literal>Configuration</literal> -&gt;<literal> OpenVSwitch
+      </literal>-&gt; <literal>Host Interfaces</literal> -&gt;<literal>
       Add</literal>:</para>
 
       <figure>
@@ -146,10 +148,10 @@
       </itemizedlist>
 
       <para>Create an OpenVSwitch bridge (<literal>ovsbr0</literal>) on the
-      device that uses a DPDK interface, by selecting the Device,
-      then the Configuration option from the top toolbar:
-      <literal>Configuration</literal>-&gt; <literal>OpenVSwitch</literal> -&gt;
-      <literal>Bridges</literal> -&gt; <literal>Add</literal>:</para>
+      device that uses a DPDK interface, by selecting the uCPE device, then
+      from the top toolbar selecting: <literal>Configuration</literal>-&gt;
+      <literal>OpenVSwitch</literal> -&gt; <literal>Bridges</literal> -&gt;
+      <literal>Add</literal>:</para>
 
       <figure>
         <title>OVS bridge</title>
@@ -167,10 +169,10 @@
       <title>SR-IOV Interface Type</title>
 
       <para>SR-IOV mode will create a number of virtual functions on host that
-      can be used to route traffic to VMs. Select the device, then the Configuration
-      option from the top toolbar: <literal>Configuration</literal>-&gt;<literal>OpenVSwitch
-      </literal>-&gt;<literal>Host Interfaces</literal>-&gt;<literal>
-      Add</literal>:</para>
+      can be used to route traffic to VMs. Select the uCPE device, then from
+      the top toolbar select: <literal>Configuration</literal> -&gt;<literal>
+      OpenVSwitch </literal>-&gt; <literal>Host Interfaces
+      </literal>-&gt;<literal> Add</literal>:</para>
 
       <para>For SR-IOV mode, the user must set following fields:</para>
 
@@ -192,12 +194,11 @@
         </listitem>
 
         <listitem>
-          <para>sriov-num-vfs: the number of virtual functions to create</para>
+          <para>sriov-num-vfs: the number of virtual functions to
+          create</para>
         </listitem>
-
       </itemizedlist>
 
-
       <figure>
         <title>SR-IOV Interface Type</title>
 
@@ -247,14 +248,13 @@
 
     <para>With the address parameter set, run
     <literal>list_deviceID.sh</literal> after NFV Access is installed and
-    booted, to get the device ID of the target.</para>
+    booted, to get the device ID of the uCPE device.</para>
 
     <note>
       <para>It is possible to let NFV Access know the uCPE Manager IP address
       at run-time by setting <literal>vcpemgr=&lt;IP&gt;</literal> as a kernel
       boot parameter in the grub configuration file. Reboot is required after
-      this update. For additional information about grub configuration, please
-      refer to the Enea NFV Access Reference Guide provided with your release.</para>
+      this update.</para>
 
       <para>This step needs to be done each time the uCPE Manager host changes
       its IP address.</para>
@@ -266,15 +266,15 @@
     <section id="adding_a_device">
       <title>Adding a Device</title>
 
-      <para>The uCPE Manager must be configured to bring the target device
-      under management. This is done by selecting <literal>Device Calls
-      Home</literal> checkbox when adding a device. When Device Calls
-      Home checkbox is checked, the device will initiate a
-      connection by opening a socket to the uCPE Manager for NETCONF
-      traffic (over SSH), while the uCPE Manager waits for device connection.</para>
-      
-      <para>For more info about how to add a device please refer to 
-      <link linkend="man_config">Manual Configuration</link>.</para>
+      <para>The uCPE Manager must be configured to bring the uCPE device under
+      management. This is done by selecting <literal>Device Calls
+      Home</literal> checkbox when adding a device. When Device Calls Home
+      checkbox is checked, the device will initiate a connection by opening a
+      socket to the uCPE Manager for NETCONF traffic (over SSH), while the
+      uCPE Manager waits for device connection.</para>
+
+      <para>For more info about how to add a device please refer to <link
+      linkend="man_config">Manual Configuration</link>.</para>
     </section>
 
     <section id="offline_configuration">
@@ -350,7 +350,7 @@
 
     <para>As the acting vnf manager, the uCPE Manager is responsible for
     handling the life-cycles of VNFs that are instantiated and run on the
-    various uCPE hosts. The vnf manager module is written so as to be able to
+    various uCPE devices. The vnf manager module is written so as to be able to
     manage multiple VNF types. Along with it is provided a generic
     infrastructure to allow the end-user to introduce new VNF types
     dynamically into the system. This allows for third-party VNFs to be added
@@ -359,8 +359,8 @@
 
     <para>The process of VNF Onboarding consists of providing the system with
     sufficient information and resources related to the VNF such that it can
-    instantiate a flavor of the VNF on the target, configure and scale it as
-    appropriate, heal and upgrade it when necessary and tear it down at the
+    instantiate a flavor of the VNF on the uCPE device, configure and scale it
+    as appropriate, heal and upgrade it when necessary and tear it down at the
     right moment.</para>
 
     <para>The vnf manager subsystem in the uCPE Manager inserts a menu item in
@@ -391,8 +391,7 @@
 
       <listitem>
         <para><literal>Instances</literal>: Choosing this option lets you
-        instantiate (or destroy) VNFs on a given uCPE host (the
-        <literal>target</literal>).</para>
+        instantiate (or destroy) VNFs on a given uCPE device.</para>
       </listitem>
 
       <listitem>
@@ -493,12 +492,21 @@
 
         <orderedlist>
           <listitem>
+            <para>Select the uCPE Device.</para>
+          </listitem>
+
+          <listitem>
+            <para>Select from the top toolbar <literal>VNF</literal> -&gt;
+            <literal>Descriptors</literal></para>
+          </listitem>
+
+          <listitem>
             <para>Click the <literal>On-board</literal> button.</para>
           </listitem>
 
           <listitem>
-            <para>When prompted by the following UI, make sure the
-            <literal>VM Image</literal> radio button is selected.</para>
+            <para>When prompted by the following UI, make sure the <literal>VM
+            Image</literal> radio button is selected.</para>
           </listitem>
         </orderedlist>
 
@@ -697,7 +705,7 @@
       <title>Instantiating a VNF</title>
 
       <para>Once the VNF bundle has been onboarded, you can instantiate a VNF
-      on a specific uCPE host.</para>
+      on a specific uCPE device.</para>
 
       <para>Launch the <literal>VNF instance</literal> table by choosing the
       <literal>Instances</literal> option from the <literal>VNF</literal>
@@ -737,10 +745,9 @@
         </listitem>
 
         <listitem>
-          <para><emphasis role="bold">VIM</emphasis>. This stands for
-          <literal> Virtual Infrastructure Manager</literal>, the target host
-          on which to instantiate a VNF, i.e. the target uCPE host that will
-          run this VNF.</para>
+          <para><emphasis role="bold">VIM</emphasis>. The uCPE device on which
+          to instantiate a VNF, i.e. the uCPE device that will run this
+          VNF.</para>
         </listitem>
 
         <listitem>
@@ -763,20 +770,20 @@
       </itemizedlist>
 
       <para>Hitting the <literal>Create</literal> button will cause the VNF to
-      be instantiated and run on the uCPE target specified above. The
+      be instantiated and run on the uCPE device specified above. The
       following operations will now take place:</para>
 
       <orderedlist>
         <listitem>
-          <para>Check if the uCPE already has the VNF Flavor definition in its
+          <para>Check if the uCPE device already has the VNF Flavor definition in its
           flavor store; if not create a new Flavor definition on the
-          uCPE.</para>
+          uCPE device.</para>
         </listitem>
 
         <listitem>
-          <para>Check if the uCPE already has the VNF image in its image
+          <para>Check if the uCPE device already has the VNF image in its image
           store; if not, upload the image and create a new Image definition on
-          the uCPE.</para>
+          the uCPE device.</para>
         </listitem>
 
         <listitem>
diff --git a/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml b/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
index b3f7645..9b28c88 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/getting_started_nfv_access.xml
@@ -1,24 +1,24 @@
-<?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="plat-release-content">
   <title>Getting Started with Enea NFV Access</title>
 
   <section id="access_installer">
-    <title>Enea NFV Access Installer</title>
+    <title>Enea NFV Access Run Time Platform Installer</title>
 
     <para>The current release supports one primary method of installation,
     using the installer, which guarantees a clean installation of NFV Access
-    on a device.</para>
+    on a uCPE device.</para>
 
     <section id="prereq">
       <title>Prerequisites</title>
 
-      <para>To install the Enea NFV Access platform, 3 things are required: a
-      USB stick (16GB or larger), a development machine with root
-      permissions(Linux or Windows) and a target device.</para>
+      <para>To install the Enea NFV Access Run Time Platform, 3 things are
+      required: a USB stick (16GB or larger), a development machine with root
+      permissions (Linux or Windows) and a uCPE device.</para>
 
-      <para>Minimal requirements for NFV Access:</para>
+      <para>Minimal requirements for the uCPE device:</para>
 
       <itemizedlist spacing="compact">
         <listitem>
@@ -45,7 +45,6 @@
       <para>Following BIOS settings to be enabled:</para>
 
       <itemizedlist spacing="compact">
-
         <listitem>
           <para>EFI</para>
         </listitem>
@@ -67,8 +66,8 @@
     <section condition="hidden" id="man_installer">
       <title>Installer Setup and Usage for a manual installation</title>
 
-      <para><emphasis role="bold">To install Enea NFV Access on a physical
-      drive</emphasis></para>
+      <para><emphasis role="bold">To install Enea NFV Access Run Time Platform
+      on a physical drive</emphasis></para>
 
       <orderedlist>
         <listitem>
@@ -192,15 +191,16 @@ rootfs_destination=</programlisting></para>
       </itemizedlist>
 
       <para>After using the installer and setting up the bootable media,
-      connect it to the target machine and configure the target machine to use
-      it as a primary boot device.</para>
+      connect it to the uCPE device and configure the uCPE device to use it as
+      a primary boot device.</para>
     </section>
 
     <section id="auto_installer">
       <title>Creating a bootable USB stick</title>
 
-      <para>In order to install Enea NFV Access, you must first create a
-      bootable USB stick with the image you intend to install.</para>
+      <para>In order to install Enea NFV Access Run Time Platform, you must
+      first create a bootable USB stick with the image you intend to
+      install.</para>
 
       <para><emphasis role="bold">Create a bootable USB stick
       image</emphasis></para>
@@ -221,13 +221,12 @@ sdb            8:0            0     111.8G  0  disk
         </listitem>
 
         <listitem>
-          <para>Copy the HDDIMG image to the USB stick, e.g:<programlisting>sudo dd if=./enea-nfv-access-&lt;target&gt;.hddimg \
+          <para>Copy the HDDIMG image to the USB stick, e.g:<programlisting>sudo dd if=./enea-nfv-access-&lt;machine&gt;.hddimg \
 of=/dev/sdb bs=4M conv=fsync</programlisting></para>
         </listitem>
       </orderedlist>
 
-      <para>Where
-      <filename>enea-nfv-access-&lt;target&gt;.hddimg
+      <para>Where <filename>enea-nfv-access-&lt;machine&gt;.hddimg
       </filename>is the .hddimg file and <literal>sdb</literal> is the
       assigned USB device name.</para>
     </section>
@@ -235,58 +234,44 @@ of=/dev/sdb bs=4M conv=fsync</programlisting></para>
     <section id="install_ena_stick">
       <title>Installing Enea NFV Access</title>
 
-      <para><emphasis role="bold">How to install Enea NFV Access using a
-      bootable USB stick image</emphasis></para>
+      <para><emphasis role="bold">How to install Enea NFV Access Run Time
+      Platform using a bootable USB stick image</emphasis></para>
 
       <orderedlist>
+
         <listitem>
-          <para>Plug the USB stick into the reference board. Make sure you are
-          connected to the serial port.</para>
+          <para>Plug the USB stick into the reference uCPE device. Make sure
+          you are connected to the serial port.</para>
         </listitem>
 
         <listitem>
-          <para>Power up the board and boot the USB stick. Verify the USB
-          stick is selected from the BIOS boot menu.</para>
+          <para>Power up the uCPE device and boot the USB stick. Verify the
+          USB stick is selected from the BIOS boot menu.</para>
         </listitem>
 
         <listitem>
           <para>Once the USB stick is properly booted, a GRUB menu appears on
           the serial console. The following options are available:</para>
 
-          <itemizedlist>
+          <itemizedlist spacing="compact">
             <listitem>
-              <para>live-boot. Boots NFV Access directly from the USB
-              stick.</para>
+              <para>live-boot. Boots NFV Access Run Time Platform directly
+              from the USB stick.</para>
             </listitem>
 
             <listitem>
-              <para>installer. Launches the NFV Access installer and uses the
-              serial port for output.</para>
+              <para>installer. Launches the NFV Access Run Time Platform
+              installer and uses the serial port for output.</para>
             </listitem>
           </itemizedlist>
 
           <note>
             <para>The graphical console requires that a display is connected
-            to the board.</para>
+            to the uCPE device.</para>
           </note>
         </listitem>
 
         <listitem>
-          <para>To launch the installer, select the <command>installer</command>
-          option from the GRUB menu:</para>
-
-          <itemizedlist>
-            <listitem>
-              <para>Install NFV Access.</para>
-            </listitem>
-
-            <listitem>
-              <para>Reboot.</para>
-            </listitem>
-          </itemizedlist>
-        </listitem>
-
-        <listitem>
           <para>Select <command>Install NFV Access</command> from the menu to
           proceed with the installation.</para>
         </listitem>
@@ -299,14 +284,15 @@ of=/dev/sdb bs=4M conv=fsync</programlisting></para>
             <listitem>
               <para><emphasis role="bold">Automatic install</emphasis>. This
               option will partition a user-defined drive and install NFV
-              Access. You can create 2 or 4 partitions, and choosing either of
-              these two options will prompt you for a drive on which to
-              install NFV Access. The 2-partition scheme divides the disk into
-              one GPT partition containing the GRUB binary and configuration,
-              leaving the rest of the disk for the root filesystem. The
-              4-partition scheme creates: a GPT partition for GRUB (similar to
-              the one in the 2-partition scheme), two 20 GB partitions, and
-              one containing the remaining free disk space.</para>
+              Access Run Time Platform. You can create 2 or 4 partitions, and
+              choosing either of these two options will prompt you for a drive
+              on which to install NFV Access Run Time Platform. The
+              2-partition scheme divides the disk into one GPT partition
+              containing the GRUB binary and configuration, leaving the rest
+              of the disk for the root filesystem. The 4-partition scheme
+              creates: a GPT partition for GRUB (similar to the one in the
+              2-partition scheme), two 20 GB partitions, and one containing
+              the remaining free disk space.</para>
 
               <para>After choosing the Automatic install option and one of the
               predefined partitioning actions, the <literal>install
@@ -332,7 +318,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting></para>
               <para><emphasis role="bold">Default
               Parameters</emphasis>:</para>
 
-              <itemizedlist spacing="compact">
+              <itemizedlist>
                 <listitem>
                   <para>Core isolation. Isolates the selected range of cores
                   from the kernel scheduler.</para>
@@ -382,7 +368,7 @@ of=/dev/sdb bs=4M conv=fsync</programlisting></para>
 
         <listitem>
           <para>At the end of the installation process, you can choose between
-          running the installer again or rebooting the board.</para>
+          running the installer again or rebooting the uCPE device.</para>
 
           <note>
             <para>The boot log will always be displayed on the serial port.
@@ -397,8 +383,8 @@ of=/dev/sdb bs=4M conv=fsync</programlisting></para>
       <title>Booting NFV Access</title>
 
       <para>After installing Enea NFV Access on a media storage device (e.g.
-      eMMC, HDD or SSD), the target must be reset so that Enea NFV Access can
-      boot. The user must configure the first stage bootloader (e.g.
+      eMMC, HDD or SSD), the uCPE device must be reset so that Enea NFV Access
+      can boot. The user must configure the first stage bootloader (e.g.
       BIOS/UEFI) to boot the system from the media storage device where NFV
       Access was installed.</para>
 
@@ -474,7 +460,7 @@ run</programlisting>
 
       <para>Workaround: If both a USB stick with the Enea NFV Access installer
       set up (e.g FS0) and an another media storage device (e.g. FS1), are
-      connected to a target machine, in order to select the former, the count
+      connected to a uCPE device, in order to select the former, the count
       down must be stopped with the default <literal>startup.nsh</literal>
       script by pressing <command>ESC</command> and then starting GRUB
       manually:</para>
@@ -506,8 +492,8 @@ run</programlisting>
     <itemizedlist>
       <listitem>
         <para>If a system has an amount of memory up to 8GB, the allocation
-         algorithm will reserve up to 30%, but no more than 2GB, for the OS
-         and rest as 2MB hugepages.</para>
+        algorithm will reserve up to 30%, but no more than 2GB, for the OS and
+        the rest as 2MB hugepages.</para>
       </listitem>
 
       <listitem>
@@ -589,7 +575,7 @@ run</programlisting>
 
         <listitem>
           <para>16GB of memory: approximately 2GB will be allocated for the OS
-           and the rest as 1GB hugepages.</para>
+          and the rest as 1GB hugepages.</para>
         </listitem>
       </itemizedlist>
 
@@ -677,7 +663,7 @@ node0.1048576kB = 3 </programlisting>
                    /* self-extracting archive installing cross-compilation
                    toolchain for the guest (QEMU x86-64) */</programlisting>
 
-    <para>For each combination of image and target, the following set of
+    <para>For each combination of image and uCPE device, the following set of
     artifacts is available:</para>
 
     <programlisting>-- bzImage
diff --git a/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml b/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml
index c31cea3..6f5cdb1 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/in_band_management.xml
@@ -7,8 +7,8 @@
   <para>In-band Management refers to a model where both the data plane and
   control plane flow over the same network path.</para>
 
-  <para>In some situations, In-Band Management is the only option available to
-  both control and configure the device, while also allowing for data-path
+  <para>In some situations, In-band Management is the only option available to
+  both control and configure the uCPE device, while also allowing for data-path
   traffic to pass over the same physical interface.</para>
 
   <para>The main requirement for this use case solution is to have all traffic
@@ -50,7 +50,7 @@
 
   <para>All network traffic, with the exception of any received from the uCPE
   Manager, will be sent towards the VNF or dropped if there is no VNF
-  instantiated on the NFV Access device. The VNF connected to the WAN bridge
+  instantiated on the uCPE device. The VNF connected to the WAN bridge
   must be configured for In-band management since traffic from the VNF manager
   and data-path will be sent to only to one port (WAN) of the VNF.</para>
 
@@ -83,7 +83,7 @@
         <row>
           <entry>uCPE Manager</entry>
 
-          <entry>uCPE Manager IP address must be public (accessible for target)
+          <entry>uCPE Manager IP address must be public (accessible for the uCPE device)
           and static</entry>
         </row>
       </tbody>
@@ -95,7 +95,7 @@
 
   <orderedlist>
     <listitem>
-      <para>Select the device.</para>
+      <para>Select the uCPE device.</para>
     </listitem>
 
     <listitem>
@@ -147,11 +147,11 @@
     </tgroup>
   </table>
 
-  <para>The connection between the device and uCPE Manager will be recreated
+  <para>The connection between the uCPE device and uCPE Manager will be recreated
   and all traffic will pass through the new bridge (ibm-wan-br). The user
   should be able to continue device configuration. The WAN port of the very
   first instantiated VNF must be connected to ibm-wan-br and it should receive
-  the same IP address as the WAN interfaces of the device.</para>
+  the same IP address as the WAN interfaces of the uCPE device.</para>
 
   <figure>
     <title>Enea In-band Management solution</title>
@@ -164,7 +164,7 @@
     </mediaobject>
   </figure>
 
-  <para>The VNF can be reached on the same IP address as the device, e.g.
+  <para>The VNF can be reached on the same IP address as the uCPE device, e.g.
   <literal>https://&lt;WAN_IP&gt;</literal> if a HTTP server is present
    on that VNF.</para>
 
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 bdaa534..e2e9802 100644
--- a/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
+++ b/doc/book-enea-nfv-access-getting-started/doc/introduction.xml
@@ -21,7 +21,7 @@
 
   <itemizedlist>
     <listitem>
-      <para>The Enea NFV Access runtime platform, which acts as the host for
+      <para>The Enea NFV Access Run Time Platform, which acts as the host for
       Virtualized Network Functions (VNFs) and provides management over
       NETCONF.</para>
     </listitem>
@@ -34,9 +34,9 @@
   </itemizedlist>
 
   <section id="nfv_access">
-    <title>Enea NFV Access runtime platform</title>
+    <title>Enea NFV Access Run Time Platform</title>
 
-    <para>Enea NFV Access runtime platform is a lightweight,
+    <para>Enea NFV Access Run Time Platform is a lightweight,
     multi-architecture virtualization platform, supporting Virtual Machines
     (KVM / QEMU) and container(s) (Docker). Designed for a low footprint and
     fast boot by only providing essential functionality.</para>