diff --git a/src/main/java/com/example/demo/enums/PhaseType.java b/src/main/java/com/example/demo/enums/PhaseType.java
index af52293cd4bdb765e92738cb61296869d57dc791..03298dbd54f4ab10a3bd1b39b568df5b829bbeef 100644
--- a/src/main/java/com/example/demo/enums/PhaseType.java
+++ b/src/main/java/com/example/demo/enums/PhaseType.java
@@ -1,7 +1,8 @@
 package com.example.demo.enums;
 
 public enum PhaseType {
-    QUESTIONNAIRE,
+    QUESTIONNAIRE_ADAPTIVE,
+    QUESTIONNAIRE_GENERAL,
     INFO,
-    GAME,
+    TRAINING,
 }
diff --git a/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java b/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
index 76e2044744264406f6519125e11f576bab840327..a96e7602cad8f528b5f3bbb52fa35571706fbfea 100644
--- a/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
+++ b/src/main/java/com/example/demo/facade/TrainingPhaseFacade.java
@@ -5,14 +5,14 @@ import com.example.demo.dto.InfoPhaseDto;
 import com.example.demo.dto.InfoPhaseUpdateDto;
 import com.example.demo.dto.PhaseCreateDTO;
 import com.example.demo.dto.QuestionnairePhaseDto;
+import com.example.demo.dto.QuestionnaireUpdateDto;
 import com.example.demo.dto.TrainingPhaseDto;
 import com.example.demo.dto.TrainingPhaseUpdateDto;
-import com.example.demo.dto.QuestionnaireUpdateDto;
 import com.example.demo.enums.PhaseType;
 import com.example.demo.service.InfoPhaseService;
-import com.example.demo.service.TrainingPhaseService;
 import com.example.demo.service.PhaseService;
 import com.example.demo.service.QuestionnairePhaseService;
+import com.example.demo.service.TrainingPhaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,10 +38,10 @@ public class TrainingPhaseFacade {
         AbstractPhaseDto abstractPhaseDto;
         if (PhaseType.INFO.equals(phaseCreateDTO.getPhaseType())) {
             abstractPhaseDto = infoPhaseService.createDefaultInfoPhase(trainingDefinitionId);
-        } else if (PhaseType.QUESTIONNAIRE.equals(phaseCreateDTO.getPhaseType())) {
-            abstractPhaseDto = questionnairePhaseService.createDefaultQuestionnairePhase(trainingDefinitionId);
-        } else {
+        } else if (PhaseType.TRAINING.equals(phaseCreateDTO.getPhaseType())) {
             abstractPhaseDto = trainingPhaseService.createDefaultTrainingPhase(trainingDefinitionId);
+        } else {
+            abstractPhaseDto = questionnairePhaseService.createDefaultQuestionnairePhase(trainingDefinitionId);
         }
 
         abstractPhaseDto.setPhaseType(phaseCreateDTO.getPhaseType());
diff --git a/src/main/java/com/example/demo/mapper/BeanMapper.java b/src/main/java/com/example/demo/mapper/BeanMapper.java
index 6d480775e207c4cb1c194d7aba794d509aaeefe2..37bfe3c50e5afc1790696530f6a398436f477f5a 100644
--- a/src/main/java/com/example/demo/mapper/BeanMapper.java
+++ b/src/main/java/com/example/demo/mapper/BeanMapper.java
@@ -67,7 +67,7 @@ public interface BeanMapper {
 
     InfoPhase toEntity(InfoPhaseUpdateDto infoPhaseUpdateDto);
 
-    @Mapping(target = "phaseType", constant = "GAME")
+    @Mapping(target = "phaseType", constant = "TRAINING")
     TrainingPhaseDto toDto(TrainingPhase trainingPhase);
 
     TrainingPhase toEntity(TrainingPhaseDto trainingPhaseDto);