diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java
index cc3f53be2..42ee13031 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java
@@ -55,7 +55,7 @@ public class CriterionAdminController extends GenericForwardComposer {
     private static final Log log = LogFactory
             .getLog(CriterionAdminController.class);
 
-    private ICriterionsModel_V2 criterionsModel_V2;
+    private ICriterionsModel criterionsModel_V2;
 
     private Component messagesContainer;
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java
index dfe0282e1..a4430a6af 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionTreeController.java
@@ -62,7 +62,7 @@ public class CriterionTreeController extends GenericForwardComposer {
 
     private IMessagesForUser messagesForUser;
 
-    private final ICriterionsModel_V2 criterionsModel;
+    private final ICriterionsModel criterionsModel;
 
     private Textbox criterionName;
 
@@ -72,7 +72,7 @@ public class CriterionTreeController extends GenericForwardComposer {
         return renderer;
     }
 
-    public CriterionTreeController(ICriterionsModel_V2 _criterionsModel) {
+    public CriterionTreeController(ICriterionsModel _criterionsModel) {
         Validate.notNull(_criterionsModel);
         this.criterionsModel = _criterionsModel;
     }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java
index 7b842acad..c2449127c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel_V2.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionsModel.java
@@ -54,9 +54,9 @@ import org.springframework.transaction.annotation.Transactional;
 @Component("criterionsModel_V2")
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
 @OnConcurrentModification(goToPage = "/resources/criterions/criterions-V2.zul")
-public class CriterionsModel_V2 implements ICriterionsModel_V2 {
+public class CriterionsModel implements ICriterionsModel {
 
-    private static final Log log = LogFactory.getLog(CriterionsModel_V2.class);
+    private static final Log log = LogFactory.getLog(CriterionsModel.class);
 
     @Autowired
     private ICriterionDAO criterionDAO;
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/ICriterionsModel_V2.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/ICriterionsModel.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/ICriterionsModel_V2.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/ICriterionsModel.java
index 96760ad4b..3413b6e7f 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/ICriterionsModel_V2.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/ICriterionsModel.java
@@ -34,7 +34,7 @@ import org.navalplanner.business.resources.entities.Worker;
  * CriterionsModel contract <br />
  * @author Óscar González Fernández <ogonzalez@igalia.com>
  */
-public interface ICriterionsModel_V2 {
+public interface ICriterionsModel {
 
     boolean getAllowHierarchy();