34 files changed, 56 insertions, 57 deletions

diff --git a/doc/Makefile b/doc/Makefile
index 5e23b2a..70135de 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,4 +1,4 @@
-#2017-06-29 Converted EL7 virtualization profile to first version of ENFV Access Platform
+#2017-06-29 Converted EL7 virtualization profile to first version of ENFV Access
 #2017-04-13 Created first version of virtualization profile
 
 #Path to this subsystem's root directory
@@ -21,16 +21,16 @@ TMPCLONEROOT_MANIFEST := $(TMPCLONEROOT)/manifest
 
 
 # ******************* AutoGenerated chapters from template and target READMEs *******
-BUILDBOOT_XML       := book-enea-nfv-access-platform-release-info/doc/build_boot_generated.xml
-BUILDBOOT_TEMPLATE  := book-enea-nfv-access-platform-release-info/doc/build_boot_template.xml
+BUILDBOOT_XML       := book-enea-nfv-access-release-info/doc/build_boot_generated.xml
+BUILDBOOT_TEMPLATE  := book-enea-nfv-access-release-info/doc/build_boot_template.xml
 
-PKGDIFF_GEN_XML     := book-enea-nfv-access-platform-release-info/doc/pkgdiff_generated.xml
-JIRA_ISSUES_GEN_XML := book-enea-nfv-access-platform-release-info/doc/jiraissues_generated.xml
+PKGDIFF_GEN_XML     := book-enea-nfv-access-release-info/doc/pkgdiff_generated.xml
+JIRA_ISSUES_GEN_XML := book-enea-nfv-access-release-info/doc/jiraissues_generated.xml
 
-MACHINE_LIST_XML    := book-enea-nfv-access-platform-release-info/doc/machine_list_generated.xml
+MACHINE_LIST_XML    := book-enea-nfv-access-release-info/doc/machine_list_generated.xml
 
-ELTF_PARAMS_TEMPLATE := book-enea-nfv-access-platform-release-info/doc/eltf_params_template.xml
-ELTF_PARAMS_UPDATED  := book-enea-nfv-access-platform-release-info/doc/eltf_params_updated.xml
+ELTF_PARAMS_TEMPLATE := book-enea-nfv-access-release-info/doc/eltf_params_template.xml
+ELTF_PARAMS_UPDATED  := book-enea-nfv-access-release-info/doc/eltf_params_updated.xml
 
 
 
@@ -48,7 +48,7 @@ DOCBOOK_TO_BOOKDIR ?= yes
 DOCBOOK_CLEANTMP ?= yes
 
 #Components (books) in this subsystem. Now use all books found here
-#  COMPONENTS := book-enea-nfv-access-platform-release-info book-enea-linux-open-source
+#  COMPONENTS := book-enea-nfv-access-release-info book-enea-linux-open-source
 #  COMPONENTS += book-enea-linux-eclipse-open-source (as of 13.04.2017 this is not needed)
 COMPONENTS := $(shell ls -d book-enea* )
 
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/benchmarks.xml b/doc/book-enea-nfv-access-guide/doc/benchmarks.xml
index daafadf..cba6150 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/benchmarks.xml
+++ b/doc/book-enea-nfv-access-guide/doc/benchmarks.xml
@@ -722,7 +722,7 @@ ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1</programlisting>Import a
         <section id="target-setup">
           <title>Test Setup</title>
 
-          <para>Boot Enea NFV Access Platform from SSD:<programlisting>linux (hd0,gpt3)/boot/bzImage root=/dev/sda3 ip=dhcp nohz_full=1-7 /
+          <para>Boot Enea NFV Access from SSD:<programlisting>linux (hd0,gpt3)/boot/bzImage root=/dev/sda3 ip=dhcp nohz_full=1-7 /
 isolcpus=1-7 rcu-nocbs=1-7 rcu_nocb_poll intel_pstate=disable clocksource=tsc /
 tsc=reliable nohpet nosoftlockup intel_idle.max_cstate=0 processor.max_cstate=0 /
 mce=ignore_ce audit=0 nmi_watchdog=0 iommu=pt intel_iommu=on hugepagesz=1GB /
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/book.xml b/doc/book-enea-nfv-access-guide/doc/book.xml
index 9b0cc4a..f23213c 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/book.xml
+++ b/doc/book-enea-nfv-access-guide/doc/book.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 ]>
-<book id="book_enea_nfv_access_platform_guide">
-  <title><trademark class="registered">Enea</trademark> NFV Access Platform Guide</title>
+<book id="book_enea_nfv_access_guide">
+  <title><trademark class="registered">Enea</trademark> NFV Access Guide</title>
   <subtitle>Release Version
         <xi:include href="eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
         xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
         <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
-        <xi:include href="platform_overview.xml"
+        <xi:include href="overview.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
         <xi:include href="getting_started.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -23,7 +23,7 @@
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
         <xi:include href="benchmarks.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
-        <xi:include href="using_nfv_access_platform_sdks.xml"
+        <xi:include href="using_nfv_access_sdks.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
         <xi:include href="../../s_docbuild/template/docsrc_common/contacting_enea_enea_linux.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/container_virtualization.xml b/doc/book-enea-nfv-access-guide/doc/container_virtualization.xml
index 055de7c..58133ae 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/container_virtualization.xml
+++ b/doc/book-enea-nfv-access-guide/doc/container_virtualization.xml
@@ -44,10 +44,10 @@
     </section>
 
     <section id="run-enfv-guest-image">
-      <title>Run an Enea NFV Access Platform guest image</title>
+      <title>Run an Enea NFV Access guest image</title>
 
-      <para>Enea NFV Access Platform guest images can run inside Docker as any
-      other container can. Before starting an Enea NFV Access Platform guest
+      <para>Enea NFV Access guest images can run inside Docker as any
+      other container can. Before starting an Enea NFV Access guest
       image, a root filesystem has to be imported in Docker:</para>
 
       <programlisting>docker import enea-linux-virtualization-guest-qemux86-64.tar.gz el7guest</programlisting>
@@ -57,7 +57,7 @@
 
       <programlisting>docker images</programlisting>
 
-      <para>Finally, start an Enea NFV Access Platform container with
+      <para>Finally, start an Enea NFV Access container with
       <literal>bash</literal> running as the shell, by running:</para>
 
       <programlisting>docker run -it el7guest /bin/bash</programlisting>
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/dpdk.xml b/doc/book-enea-nfv-access-guide/doc/dpdk.xml
index e96dd80..c9746a4 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/dpdk.xml
+++ b/doc/book-enea-nfv-access-guide/doc/dpdk.xml
@@ -25,7 +25,7 @@
   <section id="pktgen">
     <title>Pktgen</title>
 
-    <para>In addition to DPDK, Enea NFV Access Platform includes Pktgen, a
+    <para>In addition to DPDK, Enea NFV Access includes Pktgen, a
     software traffic generator that is powered by the DPDK packet processing
     framework. Pktgen can act as a transmitter or receiver and is capable of
     generating 10Gbit wire rate traffic with 64 byte frames.</para>
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/eltf_params_template.xml b/doc/book-enea-nfv-access-guide/doc/eltf_params_template.xml
index 278ad71..278ad71 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/eltf_params_template.xml
+++ b/doc/book-enea-nfv-access-guide/doc/eltf_params_template.xml
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-guide/doc/eltf_params_updated.xml
index 31a251d..31a251d 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/eltf_params_updated.xml
+++ b/doc/book-enea-nfv-access-guide/doc/eltf_params_updated.xml
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/eltf_params_updated_template_how_to_use.txt b/doc/book-enea-nfv-access-guide/doc/eltf_params_updated_template_how_to_use.txt
index 7f1d3cb..7f1d3cb 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/eltf_params_updated_template_how_to_use.txt
+++ b/doc/book-enea-nfv-access-guide/doc/eltf_params_updated_template_how_to_use.txt
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/getting_started.xml b/doc/book-enea-nfv-access-guide/doc/getting_started.xml
index 913ba81..524741a 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/getting_started.xml
+++ b/doc/book-enea-nfv-access-guide/doc/getting_started.xml
@@ -2,19 +2,19 @@
 <!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 ENFV Access Platform</title>
+  <title>Getting Started with ENFV Access</title>
 
   <section id="release-content">
-    <title>NFV Access Platform Release content</title>
+    <title>NFV Access Release content</title>
 
-    <para>The NFV Access Platform 1.0 Release contains along with other items,
+    <para>The NFV Access 1.0 Release contains along with other items,
     documentation, pre-built kernels and images, a bootloader and a
     SDK.</para>
 
     <para>The directories structure is detailed below:</para>
 
     <programlisting>-- documentation/
-   /* NFV Access Platform documentation */
+   /* NFV Access documentation */
 -- inteld1521/
    /* artifacts for the host side */
         -- deb/
@@ -30,7 +30,7 @@
                and profiling applications and kernel modules */
                 -- various artifacts
         -- sdk
-           /* NFV Access Platform SDK for the host */
+           /* NFV Access SDK for the host */
                 -- enea-glibc-x86_64-enea-image-virtualization-host-sdk /
                    -corei7-64-toolchain-7.0.sh
                    /* self-extracting archive installing
@@ -44,7 +44,7 @@
                /* precompiled artifacts for the Guest image */
                 -- various artifacts
         -- sdk
-           /* NFV Access Platform SDK for the guest */
+           /* NFV Access SDK for the guest */
                 -- enea-glibc-x86_64-enea-image-virtualization-guest-sdk /
                    -core2-64-toolchain-7.0.sh
                    /* self-extracting archive installing cross-compilation
@@ -125,7 +125,7 @@
     <title>How to use the Prebuilt Artifacts</title>
 
     <section id="boot-ramdisk">
-      <title>Booting Enea NFV Access Platform using RAMDISK</title>
+      <title>Booting Enea NFV Access using RAMDISK</title>
 
       <para>There may be use cases, especially at first target ramp-up, where
       the HDD/SDD has no partitions and you need to prepare the disks for
@@ -172,7 +172,7 @@ label el_ramfs
       <para>Restart the target. Then enter (F11) in the Boot Menu and select
       the Ethernet interface used for PXE boot. From the PXE Boot Menu select
       <emphasis role="bold">Enea Linux_RAMfs</emphasis>. Once the Enea NFV
-      Access Platform is started you can partition the HDD/SDD and install
+      Access is started you can partition the HDD/SDD and install
       GRUB as described in in the following section.</para>
     </section>
 
@@ -200,7 +200,7 @@ label el_ramfs
 
       <orderedlist>
         <listitem>
-          <para>Boot target with Enea NFV Access Platform from RAMDISK</para>
+          <para>Boot target with Enea NFV Access from RAMDISK</para>
         </listitem>
 
         <listitem>
@@ -289,19 +289,19 @@ menuentry "Linux sda7" {
     </section>
 
     <section id="boot-hdd">
-      <title>Installing and booting Enea NFV Access Platform on the
+      <title>Installing and booting Enea NFV Access on the
       harddisk</title>
 
-      <para>After partitioning the harddisk, boot Enea NFV Access Platform
+      <para>After partitioning the harddisk, boot Enea NFV Access
       from RAMFS or from a reference image installed on one of the
       partitions.</para>
 
-      <para>To install Enea Linux image on a partition follow these
+      <para>To install Enea NFV Access image on a partition follow these
       steps:</para>
 
       <orderedlist>
         <listitem>
-          <para>Copy your platform image on target:</para>
+          <para>Copy your image on target:</para>
 
           <programlisting>server&gt; scp ./enea-image-virtualization-host-inteld1521.tar.gz /
 root@&lt;target_ip&gt;:/home/root/</programlisting>
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/hypervisor_virtualization.xml b/doc/book-enea-nfv-access-guide/doc/hypervisor_virtualization.xml
index f7f186c..f7f186c 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/hypervisor_virtualization.xml
+++ b/doc/book-enea-nfv-access-guide/doc/hypervisor_virtualization.xml
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/images/virtual_network_functions.png b/doc/book-enea-nfv-access-guide/doc/images/virtual_network_functions.png
index 4011de8..4011de8 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/images/virtual_network_functions.png
+++ b/doc/book-enea-nfv-access-guide/doc/images/virtual_network_functions.png
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/platform_overview.xml b/doc/book-enea-nfv-access-guide/doc/overview.xml
index 945e25b..d3a0d8a 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/platform_overview.xml
+++ b/doc/book-enea-nfv-access-guide/doc/overview.xml
@@ -1,20 +1,19 @@
 <?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="platform_overview">
-  <title>Platform Overview</title>
+<chapter id="overview">
+  <title>Overview</title>
 
-  <para>The NFV Access Platform Guide available with this release of Enea
+  <para>The NFV Access Guide available with this release of Enea
   Linux, seeks to provide further information that will help all intended
   users make the most out of the virtualization features.</para>
 
   <section id="description">
-    <title>NFV Access Platform Description</title>
+    <title>NFV Access Description</title>
 
-    <para>Enea NFV Access is a lightweight virtualization software platform
+    <para>Enea NFV Access is a lightweight virtualization software
     designed for deployment on edge devices at customer premises. Streamlined
-    for high networking performance and minimal footprints for both platform
-    and VNFs, it enables very high compute density.</para>
+    for high networking performance and minimal footprints for both and VNFs, it enables very high compute density.</para>
 
     <para>ENFV Access also provides a foundation for vCPE agility and
     innovation, reducing cost and complexity for computing at the network
@@ -59,8 +58,8 @@
     interoperability.</para>
   </section>
 
-  <section id="platform_components">
-    <title>NFV Access Platform Components</title>
+  <section id="components">
+    <title>NFV Access Components</title>
 
     <para>Enea NFV Access is built on highly optimized open source and
     value-adding components that provide standard interfaces but with boosted
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/ovs.xml b/doc/book-enea-nfv-access-guide/doc/ovs.xml
index 3400975..3400975 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/ovs.xml
+++ b/doc/book-enea-nfv-access-guide/doc/ovs.xml
diff --git a/doc/book-enea-nfv-access-platform-guide/doc/using_nfv_access_platform_sdks.xml b/doc/book-enea-nfv-access-guide/doc/using_nfv_access_sdks.xml
index 9f0f3f5..18602a1 100644
--- a/doc/book-enea-nfv-access-platform-guide/doc/using_nfv_access_platform_sdks.xml
+++ b/doc/book-enea-nfv-access-guide/doc/using_nfv_access_sdks.xml
@@ -1,10 +1,10 @@
-<?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="workflow">
-  <title>Using NFV Access Platform SDKs</title>
+  <title>Using NFV Access SDKs</title>
 
-  <para>Enea NFV Access Platform comes with two different toolchains, one for
+  <para>Enea NFV Access comes with two different toolchains, one for
   developing applications for the host and one for applications running in the
   guest VM. Each is wrapped together with an environment-setup script into a
   shell archive and is available under the Download section on
diff --git a/doc/book-enea-nfv-access-platform-guide/swcomp.mk b/doc/book-enea-nfv-access-guide/swcomp.mk
index 4572144..0d205f3 100644
--- a/doc/book-enea-nfv-access-platform-guide/swcomp.mk
+++ b/doc/book-enea-nfv-access-guide/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-platform-guide
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access Platform $(PROD_VER) Guide"
+BOOKPACKAGES := book-enea-nfv-access-guide
+BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Guide"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/README b/doc/book-enea-nfv-access-open-source/doc/README
index c40a2d9..c40a2d9 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/README
+++ b/doc/book-enea-nfv-access-open-source/doc/README
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/about.xml b/doc/book-enea-nfv-access-open-source/doc/about.xml
index 79c8375..0ca3155 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/about.xml
+++ b/doc/book-enea-nfv-access-open-source/doc/about.xml
@@ -5,8 +5,8 @@
   <title>About this Report</title>
 
   <para>This document contains the open source and license information
-  pertaining to packages provided with Enea NFV Access Platform <xi:include
-  href="../../book-enea-nfv-access-platform-release-info/doc/eltf_params_updated.xml"
+  pertaining to packages provided with Enea NFV Access <xi:include
+  href="../../book-enea-nfv-access-release-info/doc/eltf_params_updated.xml"
   xmlns:xi="http://www.w3.org/2001/XInclude"
   xpointer="element(EneaLinux_REL_VER/1)" />.</para>
 </chapter>
\ No newline at end of file
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/book.xml b/doc/book-enea-nfv-access-open-source/doc/book.xml
index 460e242..a1f8054 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/book.xml
+++ b/doc/book-enea-nfv-access-open-source/doc/book.xml
@@ -3,10 +3,10 @@
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
 <!ENTITY % local.common.attrib "xml:base CDATA #IMPLIED">
 ]>
-<book id="book-enea-nfv-access-platform-open-source">
-  <title><trademark class="registered">Enea</trademark> NFV Access Platform Open Source Report</title>
+<book id="book-enea-nfv-access-open-source">
+  <title><trademark class="registered">Enea</trademark> NFV Access Open Source Report</title>
   <subtitle>Release Version
-         <xi:include href="../../book-enea-nfv-access-platform-release-info/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
+         <xi:include href="../../book-enea-nfv-access-release-info/doc/eltf_params_updated.xml" xpointer="element(EneaLinux_REL_VER/1)"
          xmlns:xi="http://www.w3.org/2001/XInclude" /></subtitle>
   <xi:include href="../../s_docbuild/template/docsrc_common/bookinfo_userdoc.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
   <xi:include href="about.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
diff --git a/doc/book-enea-nfv-access-platform-open-source/doc/licenses.xml b/doc/book-enea-nfv-access-open-source/doc/licenses.xml
index 2093e66..777ab00 100644
--- a/doc/book-enea-nfv-access-platform-open-source/doc/licenses.xml
+++ b/doc/book-enea-nfv-access-open-source/doc/licenses.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
 "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <chapter id="enea_linux_packages">
diff --git a/doc/book-enea-nfv-access-platform-open-source/swcomp.mk b/doc/book-enea-nfv-access-open-source/swcomp.mk
index 6324da1..7f1537f 100644
--- a/doc/book-enea-nfv-access-platform-open-source/swcomp.mk
+++ b/doc/book-enea-nfv-access-open-source/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-platform-open-source
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access Platform Open Source Report"
+BOOKPACKAGES := book-enea-nfv-access-open-source
+BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access Open Source Report"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/about_release.xml b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
index 01679f8..01679f8 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/about_release.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/about_release.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/book.xml b/doc/book-enea-nfv-access-release-info/doc/book.xml
index a0adf73..a0adf73 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/book.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/book.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/build_boot_template.xml b/doc/book-enea-nfv-access-release-info/doc/build_boot_template.xml
index e39dd81..e39dd81 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/build_boot_template.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/build_boot_template.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/eltf_params_template.xml b/doc/book-enea-nfv-access-release-info/doc/eltf_params_template.xml
index 278ad71..278ad71 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/eltf_params_template.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/eltf_params_template.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/eltf_params_updated.xml b/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated.xml
index 40507bb..40507bb 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/eltf_params_updated.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/eltf_params_updated_template_how_to_use.txt b/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated_template_how_to_use.txt
index a75acfc..a75acfc 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/eltf_params_updated_template_how_to_use.txt
+++ b/doc/book-enea-nfv-access-release-info/doc/eltf_params_updated_template_how_to_use.txt
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/getting_enea_linux.xml b/doc/book-enea-nfv-access-release-info/doc/getting_enea_linux.xml
index 075ade5..075ade5 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/getting_enea_linux.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/getting_enea_linux.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/jiraissues_override.xml b/doc/book-enea-nfv-access-release-info/doc/jiraissues_override.xml
index 7282d0f..7282d0f 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/jiraissues_override.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/jiraissues_override.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/known_bugs_and_limitations.xml b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
index 173046b..173046b 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/known_bugs_and_limitations.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/known_bugs_and_limitations.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/main_changes.xml b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
index 115acb5..115acb5 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/main_changes.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/main_changes.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/prerequisites.xml b/doc/book-enea-nfv-access-release-info/doc/prerequisites.xml
index 9c5aa95..9c5aa95 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/prerequisites.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/prerequisites.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/doc/system_requirements.xml b/doc/book-enea-nfv-access-release-info/doc/system_requirements.xml
index e94d012..e94d012 100644
--- a/doc/book-enea-nfv-access-platform-release-info/doc/system_requirements.xml
+++ b/doc/book-enea-nfv-access-release-info/doc/system_requirements.xml
diff --git a/doc/book-enea-nfv-access-platform-release-info/swcomp.mk b/doc/book-enea-nfv-access-release-info/swcomp.mk
index c246cb2..3ba7c8d 100644
--- a/doc/book-enea-nfv-access-platform-release-info/swcomp.mk
+++ b/doc/book-enea-nfv-access-release-info/swcomp.mk
@@ -5,6 +5,6 @@ BOOK_VER ?= $(REL_VER)-dev
 
 DOCBOOK_SRC := $(COMP)/swcomp.mk $(COMP)/doc/book.xml $(shell find $(COMP)/doc -type f \( -name "*.xml" -o -name "*.svg" -o -name "*.png" \) ! -name "book.xml" -print)
 
-BOOKPACKAGES := book-enea-nfv-access-platform-release-info
-BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access Platform $(PROD_VER) Release Information"
+BOOKPACKAGES := book-enea-nfv-access-release-info
+BOOKDESC_$(BOOKPACKAGES) := "Enea NFV Access $(PROD_VER) Release Information"
 BOOKDEFAULTCONDITION := $(DEFAULTCONDITIONS)
diff --git a/doc/manifest_conf.mk b/doc/manifest_conf.mk
index 92e395c..35d2e0c 100644
--- a/doc/manifest_conf.mk
+++ b/doc/manifest_conf.mk
@@ -5,4 +5,4 @@
 #MANIFESTHASH      ?= 0d0f06384afa65eaae4b170e234ee5a813edf44d
         #change the above value later to refs/tags/ELnnn (?)
 MANIFESTURL       := git@git.enea.com:linux/manifests/el_manifests-virtualization.git
-PROFILE_NAME      := Enea NFV Access Platform
+PROFILE_NAME      := Enea NFV Access