diff --git a/doc/src/user/en/docinfo b/doc/src/user/en/docinfo
index 0b7552fe5..ebce3fa22 100644
--- a/doc/src/user/en/docinfo
+++ b/doc/src/user/en/docinfo
@@ -5,12 +5,12 @@ Documentación de usuario da aplicación
 .. image:: images/logo.png
    :align: left
 
-No seguinte documento proporciónase a documentación de axuda necesaria para utilizar a aplicación de xestión da produción do auxiliar do naval Navalpro.
+No seguinte documento proporciónase a documentación de axuda necesaria para utilizar a aplicación de xestión da produción do auxiliar do naval NavalPlan.
 
 Esta documentación estó organizada do seguinte modo:
 
 En primeiro lugar descrébense os obxectivos fundamentais da aplicación e o comportamento global da mesma a modo introductorio e como contextualización xeral do uso da mesma.
 
-A continuación introdúcense as entidades básicas que será necesario administrar para poder empregar todas as funcionalidades de Navalpro e que se mencionarán nas seguintes seccións da documentación.
+A continuación introdúcense as entidades básicas que será necesario administrar para poder empregar todas as funcionalidades de NavalPlan e que se mencionarán nas seguintes seccións da documentación.
 
 Posteriormente, detállanse os procesos completos de creación de pedidos e proxectos, planificación, asignación de recursos, imputación de avances e extración de resultados.
diff --git a/doc/src/user/es/docinfo b/doc/src/user/es/docinfo
index 0b7552fe5..ebce3fa22 100644
--- a/doc/src/user/es/docinfo
+++ b/doc/src/user/es/docinfo
@@ -5,12 +5,12 @@ Documentación de usuario da aplicación
 .. image:: images/logo.png
    :align: left
 
-No seguinte documento proporciónase a documentación de axuda necesaria para utilizar a aplicación de xestión da produción do auxiliar do naval Navalpro.
+No seguinte documento proporciónase a documentación de axuda necesaria para utilizar a aplicación de xestión da produción do auxiliar do naval NavalPlan.
 
 Esta documentación estó organizada do seguinte modo:
 
 En primeiro lugar descrébense os obxectivos fundamentais da aplicación e o comportamento global da mesma a modo introductorio e como contextualización xeral do uso da mesma.
 
-A continuación introdúcense as entidades básicas que será necesario administrar para poder empregar todas as funcionalidades de Navalpro e que se mencionarán nas seguintes seccións da documentación.
+A continuación introdúcense as entidades básicas que será necesario administrar para poder empregar todas as funcionalidades de NavalPlan e que se mencionarán nas seguintes seccións da documentación.
 
 Posteriormente, detállanse os procesos completos de creación de pedidos e proxectos, planificación, asignación de recursos, imputación de avances e extración de resultados.
diff --git a/ganttzk-demo-webapp/src/main/webapp/planner/main.zul b/ganttzk-demo-webapp/src/main/webapp/planner/main.zul
index a07f54814..755810001 100644
--- a/ganttzk-demo-webapp/src/main/webapp/planner/main.zul
+++ b/ganttzk-demo-webapp/src/main/webapp/planner/main.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="Navalpro: Scheduling"?>
+<?page title="NavalPlan: Scheduling"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template_ganttzk_demo.zul"?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
diff --git a/navalplanner-webapp/src/main/resources/i18n/es.po b/navalplanner-webapp/src/main/resources/i18n/es.po
index 686f16722..b460945c4 100644
--- a/navalplanner-webapp/src/main/resources/i18n/es.po
+++ b/navalplanner-webapp/src/main/resources/i18n/es.po
@@ -758,8 +758,8 @@ msgid "percentage cannot be duplicated"
 msgstr "el porcentaje no puede estar duplicado"
 
 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:21
-msgid "Navalpro: Configuration"
-msgstr "Navalpro: Configuración"
+msgid "NavalPlan: Configuration"
+msgstr "NavalPlan: Configuración"
 
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26
 msgid "Heading"
@@ -1680,8 +1680,8 @@ msgid "Hours invested"
 msgstr "Horas invertidas"
 
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21
-msgid "Navalpro: Calendars"
-msgstr "Navalpro: Calendarios"
+msgid "NavalPlan: Calendars"
+msgstr "NavalPlan: Calendarios"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:472
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:639
@@ -1751,8 +1751,8 @@ msgid "Confirm deleting this profile. Are you sure?"
 msgstr "Confirmar el borrado de este perfil. ¿Está seguro?"
 
 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21
-msgid "Navalpro: AdvanceTypes"
-msgstr "Navalpro: AdvanceTypes"
+msgid "NavalPlan: AdvanceTypes"
+msgstr "NavalPlan: AdvanceTypes"
 
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:147
 msgid "Total hours"
@@ -2161,8 +2161,8 @@ msgid "Statistics list "
 msgstr "Lista de estadísticas "
 
 #: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21
-msgid "Navalpro: QualityForms"
-msgstr "Navalpro: Formularios de calidad"
+msgid "NavalPlan: QualityForms"
+msgstr "NavalPlan: Formularios de calidad"
 
 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
 msgid "Edit advance type data"
@@ -2493,8 +2493,8 @@ msgstr "No se han hecho asignaciones"
 #: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21
 #: navalplanner-webapp/src/main/webapp/planner/index.zul:21
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:21
-msgid "Navalpro: Scheduling"
-msgstr "Navalpro: planificación"
+msgid "NavalPlan: Scheduling"
+msgstr "NavalPlan: planificación"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:187
 msgid "Removed calendar \"{0}\""
diff --git a/navalplanner-webapp/src/main/resources/i18n/gl.po b/navalplanner-webapp/src/main/resources/i18n/gl.po
index 88c143a16..1d13db39b 100644
--- a/navalplanner-webapp/src/main/resources/i18n/gl.po
+++ b/navalplanner-webapp/src/main/resources/i18n/gl.po
@@ -757,8 +757,8 @@ msgid "percentage cannot be duplicated"
 msgstr "a porcentaxe non pode estar duplicada"
 
 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:21
-msgid "Navalpro: Configuration"
-msgstr "Navalpro: Configuración"
+msgid "NavalPlan: Configuration"
+msgstr "NavalPlan: Configuración"
 
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26
 msgid "Heading"
@@ -1677,8 +1677,8 @@ msgid "Hours invested"
 msgstr "Horas invertidas"
 
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21
-msgid "Navalpro: Calendars"
-msgstr "Navalpro: Calendarios"
+msgid "NavalPlan: Calendars"
+msgstr "NavalPlan: Calendarios"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:472
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderModel.java:639
@@ -1747,8 +1747,8 @@ msgid "Confirm deleting this profile. Are you sure?"
 msgstr "Confirmar o borrado deste perfil. ¿Está seguro?"
 
 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21
-msgid "Navalpro: AdvanceTypes"
-msgstr "Navalpro: Tipos de avance"
+msgid "NavalPlan: AdvanceTypes"
+msgstr "NavalPlan: Tipos de avance"
 
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:147
 msgid "Total hours"
@@ -2157,8 +2157,8 @@ msgid "Statistics list "
 msgstr "Lista de estatísticas"
 
 #: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21
-msgid "Navalpro: QualityForms"
-msgstr "Navalpro: Formularios de calidade"
+msgid "NavalPlan: QualityForms"
+msgstr "NavalPlan: Formularios de calidade"
 
 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
 msgid "Edit advance type data"
@@ -2487,8 +2487,8 @@ msgstr "Non se fixeron asignacións"
 #: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21
 #: navalplanner-webapp/src/main/webapp/planner/index.zul:21
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:21
-msgid "Navalpro: Scheduling"
-msgstr "Navalpro: planificación"
+msgid "NavalPlan: Scheduling"
+msgstr "NavalPlan: planificación"
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:187
 msgid "Removed calendar \"{0}\""
diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot
index 671a9245d..904cdcd28 100644
--- a/navalplanner-webapp/src/main/resources/i18n/keys.pot
+++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot
@@ -739,7 +739,7 @@ msgid "percentage cannot be duplicated"
 msgstr ""
 
 #: navalplanner-webapp/src/main/webapp/common/configuration.zul:21
-msgid "Navalpro: Configuration"
+msgid "NavalPlan: Configuration"
 msgstr ""
 
 #: navalplanner-webapp/src/main/webapp/workreports/_sortFieldsAndLabels.zul:26
@@ -1639,7 +1639,7 @@ msgid "Hours invested"
 msgstr ""
 
 #: navalplanner-webapp/src/main/webapp/calendars/calendars.zul:21
-msgid "Navalpro: Calendars"
+msgid "NavalPlan: Calendars"
 msgstr ""
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java:472
@@ -1709,7 +1709,7 @@ msgid "Confirm deleting this profile. Are you sure?"
 msgstr ""
 
 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:21
-msgid "Navalpro: AdvanceTypes"
+msgid "NavalPlan: AdvanceTypes"
 msgstr ""
 
 #: navalplanner-webapp/src/main/webapp/orders/_edition.zul:147
@@ -2115,7 +2115,7 @@ msgid "Statistics list "
 msgstr ""
 
 #: navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul:21
-msgid "Navalpro: QualityForms"
+msgid "NavalPlan: QualityForms"
 msgstr ""
 
 #: navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul:39
@@ -2442,7 +2442,7 @@ msgstr ""
 #: navalplanner-webapp/src/main/webapp/planner/resources_use.zul:21
 #: navalplanner-webapp/src/main/webapp/planner/index.zul:21
 #: navalplanner-webapp/src/main/webapp/planner/order.zul:21
-msgid "Navalpro: Scheduling"
+msgid "NavalPlan: Scheduling"
 msgstr ""
 
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:187
diff --git a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
index 7ed06fd0e..6d2c06e09 100644
--- a/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
+++ b/navalplanner-webapp/src/main/webapp/advance/advanceTypes.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('Navalpro: AdvanceTypes')}"?>
+<?page title="${i18n:_('NavalPlan: AdvanceTypes')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?page  id="List"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
diff --git a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
index 21766dd4d..dc54dc9c7 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/calendars.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('Navalpro: Calendars')}"?>
+<?page title="${i18n:_('NavalPlan: Calendars')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
 <?page  id="List"?>
diff --git a/navalplanner-webapp/src/main/webapp/common/configuration.zul b/navalplanner-webapp/src/main/webapp/common/configuration.zul
index 10f87d999..23d4a4f3e 100644
--- a/navalplanner-webapp/src/main/webapp/common/configuration.zul
+++ b/navalplanner-webapp/src/main/webapp/common/configuration.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('Navalpro: Configuration')}"?>
+<?page title="${i18n:_('NavalPlan: Configuration')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
 <?page  id="List"?>
diff --git a/navalplanner-webapp/src/main/webapp/planner/index.zul b/navalplanner-webapp/src/main/webapp/planner/index.zul
index e38f44cbc..1be9b65ac 100644
--- a/navalplanner-webapp/src/main/webapp/planner/index.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/index.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('Navalpro: Scheduling')}"?>
+<?page title="${i18n:_('NavalPlan: Scheduling')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
diff --git a/navalplanner-webapp/src/main/webapp/planner/main.zul b/navalplanner-webapp/src/main/webapp/planner/main.zul
index 509dee948..e49cc6bde 100644
--- a/navalplanner-webapp/src/main/webapp/planner/main.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/main.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('Navalpro: Scheduling')}"?>
+<?page title="${i18n:_('NavalPlan: Scheduling')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
diff --git a/navalplanner-webapp/src/main/webapp/planner/order.zul b/navalplanner-webapp/src/main/webapp/planner/order.zul
index 96277e8e4..bbb46c2e1 100644
--- a/navalplanner-webapp/src/main/webapp/planner/order.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/order.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('Navalpro: Scheduling')}"?>
+<?page title="${i18n:_('NavalPlan: Scheduling')}"?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n" ?>
 
 <?component name="newAllocationSelector"
diff --git a/navalplanner-webapp/src/main/webapp/planner/resources_use.zul b/navalplanner-webapp/src/main/webapp/planner/resources_use.zul
index 7567fc586..8c7c5903a 100644
--- a/navalplanner-webapp/src/main/webapp/planner/resources_use.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/resources_use.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('Navalpro: Scheduling')}"?>
+<?page title="${i18n:_('NavalPlan: Scheduling')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?link rel="stylesheet" type="text/css" href="/planner/css/ganttzk.css"?>
diff --git a/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul b/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul
index 01b222a00..de1ae98ab 100644
--- a/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/stretches_function.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('Navalpro: Scheduling')}"?>
+<?page title="${i18n:_('NavalPlan: Scheduling')}"?>
 <?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
 <zk xmlns:n="http://www.zkoss.org/2005/zk/native">
 
diff --git a/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul b/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul
index bb8df1868..937b4b9ba 100644
--- a/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul
+++ b/navalplanner-webapp/src/main/webapp/qualityforms/qualityForms.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page id="qualityFormsList" title="${i18n:_('Navalpro: QualityForms')}"?>
+<?page id="qualityFormsList" title="${i18n:_('NavalPlan: QualityForms')}"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 
diff --git a/navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul b/navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul
index 7067252d5..94b73b1a0 100644
--- a/navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul
+++ b/navalplanner-webapp/src/main/webapp/resourceload/resourceload.zul
@@ -18,7 +18,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 
-<?page title="${i18n:_('Navalpro: Scheduling')}"?>
+<?page title="${i18n:_('NavalPlan: Scheduling')}"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
 <?init class="org.zkoss.zkplus.databind.AnnotateDataBinderInit" ?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>