diff --git a/ganttzk-demo-webapp/pom.xml b/ganttzk-demo-webapp/pom.xml
index f76567596..85a069838 100644
--- a/ganttzk-demo-webapp/pom.xml
+++ b/ganttzk-demo-webapp/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>ganttzk-demo-webapp</artifactId>
     <packaging>war</packaging>
-    <name>Naval Planner Web Client Module</name>
+    <name>NavalPlan Web Client Module</name>
 
     <build>
         <finalName>ganttzk-demo-webapp</finalName>
@@ -72,7 +72,7 @@
             <groupId>org.zkoss.zk</groupId>
             <artifactId>zkex</artifactId>
         </dependency>
-        <!-- Naval Planner ZK Components  -->
+        <!-- NavalPlan ZK Components  -->
         <dependency>
             <groupId>org.navalplanner</groupId>
             <artifactId>ganttzk</artifactId>
diff --git a/ganttzk/pom.xml b/ganttzk/pom.xml
index aa58a6a84..faead1e21 100644
--- a/ganttzk/pom.xml
+++ b/ganttzk/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <artifactId>ganttzk</artifactId>
     <packaging>jar</packaging>
-    <name>Naval Planner ZK Components Module</name>
+    <name>NavalPlan ZK Components Module</name>
 
     <build>
         <plugins>
diff --git a/navalplanner-business/pom.xml b/navalplanner-business/pom.xml
index 9c11ddd28..ad56e0233 100644
--- a/navalplanner-business/pom.xml
+++ b/navalplanner-business/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <artifactId>navalplanner-business</artifactId>
     <packaging>jar</packaging>
-    <name>Naval Planner Business Module</name>
+    <name>NavalPlan Business Module</name>
 
     <dependencies>
         <!-- Gettext commons -->
diff --git a/navalplanner-webapp/pom.xml b/navalplanner-webapp/pom.xml
index e4100b8d8..8d52495b7 100644
--- a/navalplanner-webapp/pom.xml
+++ b/navalplanner-webapp/pom.xml
@@ -8,7 +8,7 @@
     </parent>
     <artifactId>navalplanner-webapp</artifactId>
     <packaging>war</packaging>
-    <name>Naval Planner Web Client Module</name>
+    <name>NavalPlan Web Client Module</name>
 
 	<build>
         <finalName>navalplanner-webapp</finalName>
@@ -226,12 +226,12 @@
             <groupId>org.zkoss.zk</groupId>
             <artifactId>zkex</artifactId>
         </dependency>
-        <!-- Naval Planner ZK Components  -->
+        <!-- NavalPlan ZK Components  -->
         <dependency>
             <groupId>org.navalplanner</groupId>
             <artifactId>ganttzk</artifactId>
         </dependency>
-        <!-- Naval Planner Business  -->
+        <!-- NavalPlan Business  -->
         <dependency>
             <groupId>org.navalplanner</groupId>
             <artifactId>navalplanner-business</artifactId>
diff --git a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml
index 80d6a4c31..da0868f9d 100644
--- a/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml
+++ b/navalplanner-webapp/src/main/resources/navalplanner-webapp-spring-security-config.xml
@@ -12,7 +12,7 @@
          for an explanation of the meaning of IS_AUTHENTICATED_ANONYMOUSLY and IS_AUTHENTICATED_FULLY.
     -->
 
-    <http auto-config="true" realm="Naval Planner Web Application" >
+    <http auto-config="true" realm="NavalPlan Web Application" >
 
         <!-- Web services -->
         <intercept-url pattern="/ws/rest/**" access="ROLE_WS_READER" method="GET" />
@@ -58,7 +58,7 @@
     </beans:bean>
 
     <!--
-          Beans used by the Naval Planner Web application when users are
+          Beans used by the NavalPlan Web application when users are
           registered in the database. When users are registered externally
           (e.g. in a LDAP server), these lines may be commented.
     -->
diff --git a/pom.xml b/pom.xml
index b4a1e0b0c..9713bc416 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>navalplanner</artifactId>
     <packaging>pom</packaging>
     <version>1.0.0</version>
-    <name>Naval Planner</name>
+    <name>NavalPlan</name>
 
     <!--
         ===================================================================
@@ -75,7 +75,7 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <properties>
-                <!-- Naval Planner environment properties -->
+                <!-- NavalPlan environment properties -->
                 <navalplanner.mode>dev</navalplanner.mode>
                 <!-- Hibernate properties -->
                 <hibernate.show_sql>false</hibernate.show_sql>
@@ -89,7 +89,7 @@
         <profile>
             <id>prod</id>
             <properties>
-                <!-- Naval Planner environment properties -->
+                <!-- NavalPlan environment properties -->
                 <navalplanner.mode>prod</navalplanner.mode>
                 <!-- Hibernate properties -->
                 <hibernate.show_sql>false</hibernate.show_sql>
@@ -436,13 +436,13 @@
                 <artifactId>joda-time-hibernate</artifactId>
                 <version>1.1</version>
             </dependency>
-            <!-- Naval Planner ZK Components -->
+            <!-- NavalPlan ZK Components -->
             <dependency>
                 <groupId>org.navalplanner</groupId>
                 <artifactId>ganttzk</artifactId>
                 <version>1.0.0</version>
             </dependency>
-            <!-- Naval Planner Business -->
+            <!-- NavalPlan Business -->
             <dependency>
                 <groupId>org.navalplanner</groupId>
                 <artifactId>navalplanner-business</artifactId>