diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
index c510a5f36..22db5da55 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/Order.java
@@ -75,8 +75,8 @@ public class Order extends OrderLineGroup {
         this.customer = customer;
     }
 
-    public boolean isEndDateBeforeStart() {
-        return getEndDate() != null && getEndDate().before(getInitDate());
+    public boolean isDeadlineBeforeStart() {
+        return getDeadline() != null && getDeadline().before(getInitDate());
     }
 
     public List<OrderElement> getOrderElements() {
@@ -110,9 +110,9 @@ public class Order extends OrderLineGroup {
     }
 
     @SuppressWarnings("unused")
-    @AssertTrue(message = "end date must be after start date")
-    private boolean theEndDateMustBeAfterStart() {
-        return !this.isEndDateBeforeStart();
+    @AssertTrue(message = "deadline must be after start date")
+    private boolean theDeadlineMustBeAfterStart() {
+        return !this.isDeadlineBeforeStart();
     }
 
     @SuppressWarnings("unused")
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
index 65af16f87..0b7cf69ba 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
@@ -50,7 +50,7 @@ public abstract class OrderElement extends BaseEntity {
 
     private Date initDate;
 
-    private Date endDate;
+    private Date deadline;
 
     private Boolean mandatoryInit = false;
 
@@ -107,12 +107,12 @@ public abstract class OrderElement extends BaseEntity {
         this.initDate = initDate;
     }
 
-    public Date getEndDate() {
-        return copy(endDate);
+    public Date getDeadline() {
+        return copy(deadline);
     }
 
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
+    public void setDeadline(Date deadline) {
+        this.deadline = deadline;
     }
 
     public void setMandatoryInit(Boolean mandatoryInit) {
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java
index 1ba91ec5d..e63e5beae 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java
@@ -83,7 +83,7 @@ public class OrderLine extends OrderElement {
         result.setName(getName());
         result.setCode(getCode());
         result.setInitDate(getInitDate());
-        result.setEndDate(getEndDate());
+        result.setDeadline(getDeadline());
 
         this.setName(getName() + " (copy)");
         this.setCode(getCode() + " (copy)");
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
index 989e64431..738394540 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
@@ -155,7 +155,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
 
         result.setName(getName());
         result.setInitDate(getInitDate());
-        result.setEndDate(getEndDate());
+        result.setDeadline(getDeadline());
         result.setWorkHours(0);
         result.directAdvanceAssignments = new HashSet<DirectAdvanceAssignment>(
                 this.directAdvanceAssignments);
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
index a5da0eb23..e9770da1c 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/orders/entities/Orders.hbm.xml
@@ -11,7 +11,7 @@
 
         <property name="name" access="field" />
         <property name="initDate" access="field" />
-        <property name="endDate" access="field" />
+        <property name="deadline" access="field" />
         <property name="mandatoryInit" access="field" />
         <property name="mandatoryEnd" access="field" />
         <property name="description" access="field" />
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
index 855e10bc4..c9b58efbb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
@@ -431,13 +431,13 @@ public class OrderElementTreeController extends GenericForwardComposer {
 
                         @Override
                         public Date get() {
-                            return orderElementForThisRow.getEndDate();
+                            return orderElementForThisRow.getDeadline();
                         }
                     }, new Util.Setter<Date>() {
 
                         @Override
                         public void set(Date value) {
-                            orderElementForThisRow.setEndDate(value);
+                            orderElementForThisRow.setDeadline(value);
                         }
                     }));
 
diff --git a/navalplanner-webapp/src/main/webapp/orders/_edition.zul b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
index 55303efb9..34447ecde 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_edition.zul
@@ -56,9 +56,9 @@
                                 value="@{controller.order.initDate}" />
                         </row>
                         <row>
-                            <label value="${i18n:_('Ending date')}" />
+                            <label value="${i18n:_('Deadline')}" />
                             <datebox
-                                value="@{controller.order.endDate}" />
+                                value="@{controller.order.deadline}" />
                         </row>
                         <row>
                             <label value="${i18n:_('Responsible')}" />
diff --git a/navalplanner-webapp/src/main/webapp/orders/_list.zul b/navalplanner-webapp/src/main/webapp/orders/_list.zul
index a2d46843c..63e79788f 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_list.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_list.zul
@@ -26,8 +26,8 @@
             <column label="${i18n:_('Code')}" sort="auto(code)" />
             <column label="${i18n:_('Starting date')}"
                 sort="auto(initDate)" />
-            <column label="${i18n:_('Ending date')}"
-                sort="auto(endDate)" />
+            <column label="${i18n:_('Deadline')}"
+                sort="auto(deadline)" />
             <column label="${i18n:_('Responsible')}"
                 sort="auto(responsible)" />
             <column label="${i18n:_('Customer')}" sort="auto(customer)" />
@@ -40,7 +40,7 @@
                 <label value="@{order.name}" />
                 <label value="@{order.code}" />
                 <label value="@{order.initDate}" />
-                <label value="@{order.endDate}" />
+                <label value="@{order.deadline}" />
                 <label value="@{order.responsible}" />
                 <label value="@{order.customer}" />
                 <label value="@{order.description}" />
diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul
index fd2de0128..7258ea1bb 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementDetails.zul
@@ -30,10 +30,10 @@
                 </hbox>
             </row>
             <row>
-                <label value="${i18n:_('Ending date')}" />
+                <label value="${i18n:_('Deadline')}" />
                 <hbox>
-                    <datebox id="endDate"
-                        value="@{detailsController.orderElement.endDate}" />
+                    <datebox id="deadline"
+                        value="@{detailsController.orderElement.deadline}" />
                     <checkbox id="mandatoryEnd"
                         checked="@{detailsController.orderElement.mandatoryEnd}" />
                     <label value="${i18n:_('Mandatory')}" />
diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul
index 2a7a077a3..03e44d1db 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementTree.zul
@@ -63,8 +63,8 @@
             <treecols sizable="false">
                 <treecol label="${i18n:_('Name and description')}" class="name"/>
                 <treecol label="${i18n:_('Code')}" class="code"/>
-                <treecol label="${i18n:_('Estimated init')}" class="estimated_init"/>
-                <treecol label="${i18n:_('Estimated end')}" class="estimated_end"/>
+                <treecol label="${i18n:_('Must start after')}" class="estimated_init"/>
+                <treecol label="${i18n:_('Deadline')}" class="estimated_end"/>
                 <treecol label="${i18n:_('Hours')}" class="hours"
                     tooltiptext="${i18n:_('Total order element hours')}" />
                 <treecol label="${i18n:_('Operations')}" class="operations"
diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
index 9b11276fe..e7a53514f 100644
--- a/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
+++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/orders/OrderModelTest.java
@@ -220,7 +220,7 @@ public class OrderModelTest {
     public void shouldSendValidationExceptionIfEndDateIsBeforeThanStartingDate()
             throws ValidationException {
         Order order = createValidOrder();
-        order.setEndDate(year(0));
+        order.setDeadline(year(0));
         orderModel.setOrder(order);
         orderModel.save();
     }