diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java
index 3a8c82568..25e98c36a 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/HoursGroup.java
@@ -47,13 +47,13 @@ public class HoursGroup extends BaseEntity implements Cloneable {
     public static HoursGroup createUnvalidated(String name,
             ResourceEnum resourceType, Integer workingHours) {
         HoursGroup result = new HoursGroup();
-        result.setName(name);
+        result.setCode(name);
         result.setResourceType(resourceType);
         result.setWorkingHours(workingHours);
         return create(result);
     }
 
-    private String name;
+    private String code;
 
     private ResourceEnum resourceType = ResourceEnum.WORKER;
 
@@ -81,13 +81,13 @@ public class HoursGroup extends BaseEntity implements Cloneable {
         this.parentOrderLine = parentOrderLine;
     }
 
-    @NotEmpty(message = "name (code) not specified")
-    public String getName() {
-        return name;
+    @NotEmpty(message = "code not specified")
+    public String getCode() {
+        return code;
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public void setCode(String name) {
+        this.code = name;
     }
 
     public ResourceEnum getResourceType() {
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 3cdb9a832..ad43d4cf6 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
@@ -49,7 +49,7 @@ public class OrderLine extends OrderElement {
         OrderLine result = create();
         HoursGroup hoursGroup = HoursGroup.create(result);
         result.addHoursGroup(hoursGroup);
-        hoursGroup.setName(_(INITIAL_HOURS_GROUP_NAME));
+        hoursGroup.setCode(_(INITIAL_HOURS_GROUP_NAME));
         hoursGroup.setFixedPercentage(false);
         hoursGroup.setPercentage(new BigDecimal(1));
         hoursGroup.setWorkingHours(hours);
@@ -161,7 +161,7 @@ public class OrderLine extends OrderElement {
             HoursGroup hoursGroup = HoursGroup.create(this);
             hoursGroup.setWorkingHours(workHours);
             hoursGroup.setPercentage((new BigDecimal(1).setScale(2)));
-            hoursGroup.setName(_(INITIAL_HOURS_GROUP_NAME));
+            hoursGroup.setCode(_(INITIAL_HOURS_GROUP_NAME));
             hoursGroups.add(hoursGroup);
         } else {
 
@@ -476,18 +476,18 @@ public class OrderLine extends OrderElement {
         return null;
     }
 
-    public boolean containsHoursGroup(String name) {
+    public boolean containsHoursGroup(String code) {
         for (HoursGroup hoursGroup : getHoursGroups()) {
-            if (hoursGroup.getName().equals(name)) {
+            if (hoursGroup.getCode().equals(code)) {
                 return true;
             }
         }
         return false;
     }
 
-    public HoursGroup getHoursGroup(String name) {
+    public HoursGroup getHoursGroup(String code) {
         for (HoursGroup hoursGroup : getHoursGroups()) {
-            if (hoursGroup.getName().equals(name)) {
+            if (hoursGroup.getCode().equals(code)) {
                 return hoursGroup;
             }
         }
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 b2f01aaef..789d91615 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
@@ -98,7 +98,7 @@
         </id>
         <version name="version" access="property" type="long" />
 
-        <property name="name" access="field" not-null="true"/>
+        <property name="code" access="field" not-null="true" />
         <property name="resourceType" access="field" />
         <property name="workingHours" access="field" not-null="true"/>
         <property name="percentage" access="field" />
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java
index a5b81a26b..0f903a156 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/orders/entities/AddAdvanceAssignmentsToOrderElementTest.java
@@ -125,7 +125,7 @@ public class AddAdvanceAssignmentsToOrderElementTest {
         result.setCode(code);
         HoursGroup hoursGroup = HoursGroup.create(result);
         hoursGroup.setWorkingHours(0);
-        hoursGroup.setName("hoursGroupName");
+        hoursGroup.setCode("hoursGroupName");
         result.addHoursGroup(hoursGroup);
         return result;
     }
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/ResourceAllocationDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/ResourceAllocationDAOTest.java
index 698e37522..96bb25b6f 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/ResourceAllocationDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/ResourceAllocationDAOTest.java
@@ -115,7 +115,7 @@ public class ResourceAllocationDAOTest {
         orderElementDAO.save(orderLine);
 
         HoursGroup hoursGroup = HoursGroup.create(orderLine);
-        hoursGroup.setName("hoursGroupName");
+        hoursGroup.setCode("hoursGroupName");
         hoursGroupDAO.save(hoursGroup);
 
         List<HoursGroup> hoursGroups = Arrays.asList(hoursGroup);
diff --git a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
index efdbc2299..54bded6d9 100644
--- a/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
+++ b/navalplanner-business/src/test/java/org/navalplanner/business/test/planner/daos/TaskElementDAOTest.java
@@ -114,7 +114,7 @@ public class TaskElementDAOTest {
 
     private Task createValidTask() {
         associatedHoursGroup = new HoursGroup();
-        associatedHoursGroup.setName("hoursGroupName");
+        associatedHoursGroup.setCode("hoursGroupName");
         OrderLine orderLine = createOrderLine();
         orderLine.addHoursGroup(associatedHoursGroup);
         TaskSource taskSource = TaskSource
@@ -131,7 +131,7 @@ public class TaskElementDAOTest {
         orderLine.setName("bla");
         orderLine.setCode("code-" + UUID.randomUUID());
         HoursGroup hoursGroup = new HoursGroup();
-        hoursGroup.setName("hoursGroupName");
+        hoursGroup.setCode("hoursGroupName");
         orderLine.addHoursGroup(hoursGroup);
         Order order = Order.create();
         order.setName("bla");
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java
index a6708e080..5ce1594b0 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedCriterionRequirementToOrderElementModel.java
@@ -317,7 +317,7 @@ public class AssignedCriterionRequirementToOrderElementModel  implements
 
             // Set generated name
             int number = (asOrderLine()).getHoursGroups().size() - 1;
-            newHoursGroup.setName(_("New hours group ") + number);
+            newHoursGroup.setCode(_("New hours group ") + number);
 
             return newHoursGroup;
         }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java
index ed69a6f84..f87aeeb87 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/HoursGroupWrapper.java
@@ -82,13 +82,13 @@ public class HoursGroupWrapper implements INewObject,
         }
     }
 
-    public String getName() {
-        return this.hoursGroup.getName();
+    public String getCode() {
+        return this.hoursGroup.getCode();
     }
 
-    public void setName(String name) {
+    public void setCode(String code) {
         if (hoursGroup != null) {
-            hoursGroup.setName(name);
+            hoursGroup.setCode(code);
         }
     }
 
@@ -358,16 +358,16 @@ public class HoursGroupWrapper implements INewObject,
 
     @Override
     public int compareTo(HoursGroupWrapper hoursGroupWrapper) {
-        final String name = getName();
-        final String otherName = hoursGroupWrapper.getName();
-        if (name == null) {
-            LOG.warn(hoursGroup + " has a null name");
+        final String code = getCode();
+        final String otherCode = hoursGroupWrapper.getCode();
+        if (code == null) {
+            LOG.warn(hoursGroup + " has a null code");
             return -1;
         }
-        if (otherName == null) {
-            LOG.warn(hoursGroupWrapper.hoursGroup + " has a null name");
+        if (otherCode == null) {
+            LOG.warn(hoursGroupWrapper.hoursGroup + " has a null code");
             return 1;
         }
-        return name.compareTo(otherName);
+        return code.compareTo(otherCode);
     }
 }
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/HoursGroupDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/HoursGroupDTO.java
index 96fd9e2fc..799d12937 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/HoursGroupDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/api/HoursGroupDTO.java
@@ -33,7 +33,7 @@ import org.navalplanner.ws.common.api.ResourceEnumDTO;
 public class HoursGroupDTO {
 
     @XmlAttribute(name = "code")
-    public String name;
+    public String code;
 
     @XmlAttribute(name = "resource-type")
     public ResourceEnumDTO resourceType;
@@ -46,7 +46,7 @@ public class HoursGroupDTO {
 
     public HoursGroupDTO(String name, ResourceEnumDTO resourceType,
             Integer workingHours) {
-        this.name = name;
+        this.code = name;
         this.resourceType = resourceType;
         this.workingHours = workingHours;
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementConverter.java
index 4e83a7ad9..fa49f0473 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementConverter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/orders/impl/OrderElementConverter.java
@@ -131,7 +131,7 @@ public final class OrderElementConverter {
     public final static HoursGroupDTO toDTO(HoursGroup hoursGroup) {
         ResourceEnumDTO resourceType = ResourceEnumConverter.toDTO(hoursGroup
                 .getResourceType());
-        return new HoursGroupDTO(hoursGroup.getName(), resourceType, hoursGroup
+        return new HoursGroupDTO(hoursGroup.getCode(), resourceType, hoursGroup
                 .getWorkingHours());
     }
 
@@ -246,7 +246,7 @@ public final class OrderElementConverter {
         ResourceEnum resourceType = ResourceEnumConverter
                 .fromDTO(hoursGroupDTO.resourceType);
         HoursGroup hoursGroup = HoursGroup.createUnvalidated(
-                hoursGroupDTO.name, resourceType, hoursGroupDTO.workingHours);
+                hoursGroupDTO.code, resourceType, hoursGroupDTO.workingHours);
         return hoursGroup;
     }
 
@@ -261,9 +261,9 @@ public final class OrderElementConverter {
 
             for (HoursGroupDTO hoursGroupDTO : ((OrderLineDTO) orderElementDTO).hoursGroups) {
                 if (((OrderLine) orderElement)
-                        .containsHoursGroup(hoursGroupDTO.name)) {
+                        .containsHoursGroup(hoursGroupDTO.code)) {
                     update(((OrderLine) orderElement)
-                            .getHoursGroup(hoursGroupDTO.name), hoursGroupDTO);
+                            .getHoursGroup(hoursGroupDTO.code), hoursGroupDTO);
                 } else {
                     ((OrderLine) orderElement)
                             .addHoursGroup(toEntity(hoursGroupDTO));
@@ -353,7 +353,7 @@ public final class OrderElementConverter {
 
     public final static void update(HoursGroup hoursGroup,
             HoursGroupDTO hoursGroupDTO) {
-        if (!hoursGroup.getName().equals(hoursGroupDTO.name)) {
+        if (!hoursGroup.getCode().equals(hoursGroupDTO.code)) {
             throw new RuntimeException(
                     _("Not the same hours group, impossible to update"));
         }
diff --git a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul
index 293734f63..42592e239 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_listOrderElementCriterionRequirements.zul
@@ -149,7 +149,7 @@ criterionRequirementsController = new org.navalplanner.web.orders.AssignedCriter
         model="@{criterionRequirementsController.hoursGroupWrappers}">
         <columns>
             <newdatasortablecolumn width="25px" sort="auto"/>
-            <newdatasortablecolumn label="Name" width="160px" sort="auto(name)" sortDirection="ascending" align="center"/>
+            <newdatasortablecolumn label="Code" width="160px" sort="auto(code)" sortDirection="ascending" align="center"/>
             <newdatasortablecolumn label="Type" width="130px" align="center"/>
             <newdatasortablecolumn label="Hours" width="120px" align="center"/>
             <newdatasortablecolumn label="%" width="100px" align="center"/>
@@ -162,7 +162,7 @@ criterionRequirementsController = new org.navalplanner.web.orders.AssignedCriter
                     <listHoursGroupCriterionRequirements/>
                     <separator bar="false" spacing="40px" orient="vertical"/>
                 </detail>
-                <textbox value="@{hoursGroupWrapper.name}"
+                <textbox value="@{hoursGroupWrapper.code}"
                     readonly = "@{criterionRequirementsController.readOnly}"/>
                 <combobox id="comboboxTypeHoursGroup" width="80px"
                         value = "@{hoursGroupWrapper.resourceType}"
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 e260a27d7..15f1e1dc0 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
@@ -289,7 +289,7 @@ public class OrderModelTest {
         result.setCode("code-" + UUID.randomUUID());
 
         HoursGroup hoursGroup = HoursGroup.create(result);
-        hoursGroup.setName("hoursGroupName");
+        hoursGroup.setCode("hoursGroupName");
         hoursGroup.setWorkingHours(0);
         result.addHoursGroup(hoursGroup);
 
@@ -321,7 +321,7 @@ public class OrderModelTest {
         container.add(leaf);
         order.add(container);
         HoursGroup hoursGroup = HoursGroup.create(leaf);
-        hoursGroup.setName("hoursGroupName");
+        hoursGroup.setCode("hoursGroupName");
         hoursGroup.setWorkingHours(3);
         leaf.addHoursGroup(hoursGroup);
         orderModel.setOrder(order);
@@ -369,10 +369,10 @@ public class OrderModelTest {
         order.add(orderLine);
 
         HoursGroup hoursGroup = HoursGroup.create(orderLine);
-        hoursGroup.setName("hoursGroupName");
+        hoursGroup.setCode("hoursGroupName");
         hoursGroup.setWorkingHours(10);
         HoursGroup hoursGroup2 = HoursGroup.create(orderLine);
-        hoursGroup2.setName("hoursGroupName2");
+        hoursGroup2.setCode("hoursGroupName2");
         hoursGroup2.setWorkingHours(5);
 
         orderLine.addHoursGroup(hoursGroup);
diff --git a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java
index 60cce8550..629bf8d69 100644
--- a/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java
+++ b/navalplanner-webapp/src/test/java/org/navalplanner/web/test/ws/orders/OrderElementServiceTest.java
@@ -283,7 +283,7 @@ public class OrderElementServiceTest {
         assertThat(constraintViolations.size(), equalTo(2));
         for (ConstraintViolationDTO constraintViolationDTO : constraintViolations) {
             assertThat(constraintViolationDTO.fieldName, anyOf(
-                    equalTo("HoursGroup::name"),
+                    equalTo("HoursGroup::code"),
                     equalTo("HoursGroup::workingHours")));
         }
 
@@ -738,7 +738,7 @@ public class OrderElementServiceTest {
         assertThat(orderLine.getHoursGroups().size(), equalTo(2));
 
         for (HoursGroup hoursGroup : orderLine.getHoursGroups()) {
-            assertThat(hoursGroup.getName(), anyOf(equalTo("hours-group"),
+            assertThat(hoursGroup.getCode(), anyOf(equalTo("hours-group"),
                     equalTo("hours-group2")));
             assertThat(hoursGroup.getWorkingHours(), anyOf(
                     equalTo(1500), equalTo(2000)));