diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java
index 98a49a844..a82f63cd3 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/AssignmentFunction.java
@@ -61,7 +61,7 @@ public abstract class AssignmentFunction extends BaseEntity {
 
     public abstract String getName();
 
-    public enum ASSIGNMENT_FUNCTION_NAME {
+    public enum AssignmentFunctionName {
         FLAT(_("Flat")),
         MANUAL(_("Manual")),
         STRETCHES(_("Stretches")),
@@ -70,7 +70,7 @@ public abstract class AssignmentFunction extends BaseEntity {
 
         private String name;
 
-        private ASSIGNMENT_FUNCTION_NAME(String name) {
+        private AssignmentFunctionName(String name) {
             this.name = name;
         }
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/FlatFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/FlatFunction.java
index 1456a1a41..688cdc456 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/FlatFunction.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/FlatFunction.java
@@ -44,7 +44,7 @@ public class FlatFunction extends AssignmentFunction {
     }
 
     public String getName() {
-        return ASSIGNMENT_FUNCTION_NAME.FLAT.toString();
+        return AssignmentFunctionName.FLAT.toString();
     }
 
 
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ManualFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ManualFunction.java
index e8ac0035e..bc94d78db 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ManualFunction.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ManualFunction.java
@@ -33,7 +33,7 @@ public class ManualFunction extends AssignmentFunction {
 
     @Override
     public String getName() {
-        return ASSIGNMENT_FUNCTION_NAME.MANUAL.toString();
+        return AssignmentFunctionName.MANUAL.toString();
     }
 
     @Override
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java
index 037bec397..81cb44545 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SigmoidFunction.java
@@ -52,7 +52,7 @@ public class SigmoidFunction extends AssignmentFunction {
 
     @Override
     public String getName() {
-        return ASSIGNMENT_FUNCTION_NAME.SIGMOID.toString();
+        return AssignmentFunctionName.SIGMOID.toString();
     }
 
     @Override
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java
index 82ef542e2..eebe330fb 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java
@@ -387,9 +387,9 @@ public class StretchesFunction extends AssignmentFunction {
     @Override
     public String getName() {
         if (StretchesFunctionTypeEnum.INTERPOLATED.equals(type)) {
-            return ASSIGNMENT_FUNCTION_NAME.INTERPOLATION.toString();
+            return AssignmentFunctionName.INTERPOLATION.toString();
         } else {
-            return ASSIGNMENT_FUNCTION_NAME.STRETCHES.toString();
+            return AssignmentFunctionName.STRETCHES.toString();
         }
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
index 2143e9ed3..625295a37 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java
@@ -45,7 +45,7 @@ import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.navalplanner.business.planner.entities.AggregateOfResourceAllocations;
 import org.navalplanner.business.planner.entities.AssignmentFunction;
-import org.navalplanner.business.planner.entities.AssignmentFunction.ASSIGNMENT_FUNCTION_NAME;
+import org.navalplanner.business.planner.entities.AssignmentFunction.AssignmentFunctionName;
 import org.navalplanner.business.planner.entities.CalculatedValue;
 import org.navalplanner.business.planner.entities.GenericResourceAllocation;
 import org.navalplanner.business.planner.entities.ManualFunction;
@@ -1332,7 +1332,7 @@ class Row {
         }
 
         private boolean isSigmoid(String value) {
-            return ASSIGNMENT_FUNCTION_NAME.SIGMOID.toString().equals(value);
+            return AssignmentFunctionName.SIGMOID.toString().equals(value);
         }
 
         private void showCannotApplySigmoidFunction() {
@@ -1380,7 +1380,7 @@ class Row {
 
         @Override
         public String getName() {
-            return ASSIGNMENT_FUNCTION_NAME.FLAT.toString();
+            return AssignmentFunctionName.FLAT.toString();
         }
 
         @Override
@@ -1417,7 +1417,7 @@ class Row {
 
         @Override
         public String getName() {
-            return ASSIGNMENT_FUNCTION_NAME.MANUAL.toString();
+            return AssignmentFunctionName.MANUAL.toString();
         }
 
         @Override
@@ -1471,7 +1471,7 @@ class Row {
 
         @Override
         public String getName() {
-            return ASSIGNMENT_FUNCTION_NAME.STRETCHES.toString();
+            return AssignmentFunctionName.STRETCHES.toString();
         }
     };
 
@@ -1494,7 +1494,7 @@ class Row {
 
         @Override
         public String getName() {
-            return ASSIGNMENT_FUNCTION_NAME.INTERPOLATION.toString();
+            return AssignmentFunctionName.INTERPOLATION.toString();
         }
     };
 
@@ -1512,7 +1512,7 @@ class Row {
 
         @Override
         public String getName() {
-            return ASSIGNMENT_FUNCTION_NAME.SIGMOID.toString();
+            return AssignmentFunctionName.SIGMOID.toString();
         }
 
         @Override
@@ -1597,7 +1597,7 @@ class Row {
             List<? extends ResourceAllocation<?>> allocations) {
         AssignmentFunction function = getAssignmentFunction(allocations);
         return (function != null) ? function.getName()
-                : ASSIGNMENT_FUNCTION_NAME.FLAT.toString();
+                : AssignmentFunctionName.FLAT.toString();
     }
 
     private AssignmentFunction getAssignmentFunction(
@@ -1664,7 +1664,7 @@ class Row {
 
     private void changeAssignmentFunctionToManual() {
         assignmentFunctionsCombo
-                .setSelectedFunction(ASSIGNMENT_FUNCTION_NAME.MANUAL.toString());
+                .setSelectedFunction(AssignmentFunctionName.MANUAL.toString());
         ResourceAllocation<?> allocation = getAllocation();
         if (!(allocation.getAssignmentFunction() instanceof ManualFunction)) {
             allocation.setAssignmentFunction(ManualFunction.create());