diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java
similarity index 98%
rename from navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java
rename to navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java
index d5bada45c..5b3aec7d8 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController_V2.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/criterion/CriterionAdminController.java
@@ -50,10 +50,10 @@ import org.zkoss.zul.Window;
 /**
  * Controller for Criterions <br />
  */
-public class CriterionAdminController_V2 extends GenericForwardComposer {
+public class CriterionAdminController extends GenericForwardComposer {
 
     private static final Log log = LogFactory
-            .getLog(CriterionAdminController_V2.class);
+            .getLog(CriterionAdminController.class);
 
     private ICriterionsModel_V2 criterionsModel_V2;
 
@@ -85,7 +85,7 @@ public class CriterionAdminController_V2 extends GenericForwardComposer {
 
     private CriterionWorkersController workers;
 
-    public CriterionAdminController_V2() {
+    public CriterionAdminController() {
 
     }
 
diff --git a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
index 4fcc8894d..c12c14e84 100644
--- a/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/criterions/criterions.zul
@@ -29,7 +29,7 @@
 <?component name="edition" inline="true" macroURI="_edition.zul"?>
 <zk>
  <window self="@{define(content)}"
-  apply="org.navalplanner.web.resources.criterion.CriterionAdminController_V2">
+  apply="org.navalplanner.web.resources.criterion.CriterionAdminController">
   <vbox id="messagesContainer"></vbox>
   <list top_id="listWindow" />
   <edition top_id="createComponent" title="${i18n:_('Create Criterion Type')}"