diff --git a/src/main/java/cz/cvut/kbss/analysis/controller/SystemController.java b/src/main/java/cz/cvut/kbss/analysis/controller/SystemController.java
index 8b14461..2ebf95e 100755
--- a/src/main/java/cz/cvut/kbss/analysis/controller/SystemController.java
+++ b/src/main/java/cz/cvut/kbss/analysis/controller/SystemController.java
@@ -67,10 +67,10 @@ public System create(@RequestBody System system) {
     public System rename(@RequestBody System system) {
         log.info("> rename - {}", system);
 
-        System updatedTree = repositoryService.rename(system);
+        System updatedSystem = repositoryService.rename(system);
 
-        log.info("< rename - {}", updatedTree);
-        return updatedTree;
+        log.info("< rename - {}", updatedSystem);
+        return updatedSystem;
     }
 
     @ResponseStatus(HttpStatus.NO_CONTENT)
diff --git a/src/main/java/cz/cvut/kbss/analysis/service/FaultTreeRepositoryService.java b/src/main/java/cz/cvut/kbss/analysis/service/FaultTreeRepositoryService.java
index 86d0ce0..65adcf3 100755
--- a/src/main/java/cz/cvut/kbss/analysis/service/FaultTreeRepositoryService.java
+++ b/src/main/java/cz/cvut/kbss/analysis/service/FaultTreeRepositoryService.java
@@ -56,7 +56,7 @@ public class FaultTreeRepositoryService extends ComplexManagedEntityRepositorySe
     private final FailureRateDao failureRateDao;
 
     @Autowired
-    public FaultTreeRepositoryService(@Qualifier("defaultEntityValidator") EntityValidator validator,
+    public FaultTreeRepositoryService(@Qualifier("faultTreeValidator") EntityValidator validator,
                                       FaultTreeDao faultTreeDao,
                                       FaultEventScenarioDao faultEventScenarioDao,
                                       FaultEventRepositoryService faultEventRepositoryService,