From 0b24bae280adf328ab8019d72013a889347f9c24 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Mon, 5 Dec 2022 18:35:25 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-191

---
 ...r.java => ClearingCalendarController.java} |  12 +-
 ...ontroller.java => LauncherController.java} |  24 +-
 ...ler.java => PlanerAllTodayController.java} |  15 +-
 ...Controller.java => PlannerController.java} |  12 +-
 ...er.java => PlannerTemplateController.java} |  12 +-
 .../{TaskRunnerNew.java => LauncherNew.java}  |   8 +-
 ...ava => ClearingCalendarBackendGetAll.java} |  14 +-
 ...GetAll.java => LauncherBackendGetAll.java} |  22 +-
 ...lds.java => LauncherBackendGetFields.java} |   2 +-
 .../SchedulerAllTodayBackendGetAll.java       |   4 +-
 .../schedule/SchedulerBackendGetAll.java      |   4 +-
 .../schedule/TimetableBackendGetAll.java      |   4 +-
 .../validation/ActionValidationProvider.java  |  14 +-
 ...le.java => LauncherNewValidationRule.java} |  10 +-
 .../src/main/resources/meta/data.xml          | 249 +++++++++---------
 .../src/main/resources/meta/meta.xml          |  12 +-
 ...tedDeal.java => AdmittedDealRegister.java} |   2 +-
 ...ingCalendar.java => ClearingCalendar.java} |  86 +++---
 .../{TaskRunner.java => Launcher.java}        |  67 +++--
 .../{Scheduler.java => Planner.java}          | 146 +++++-----
 ...ulerAllToday.java => PlannerAllToday.java} | 178 ++++++-------
 .../{Timetable.java => PlannerTemplate.java}  |  86 +++---
 .../spcex/clearing/error/ClearingError.java   |   4 +-
 ...ctionary.java => DayStatusDictionary.java} |  20 +-
 ...eDictionary.java => ParentDictionary.java} |  20 +-
 ...ore.java => ClearingCalendarMapStore.java} | 122 ++++-----
 ...nerMapStore.java => LauncherMapStore.java} | 118 ++++-----
 ...ulerMapStore.java => PlannerMapStore.java} | 134 +++++-----
 ...tore.java => PlannerTemplateMapStore.java} | 122 ++++-----
 .../DayStatusDictionaryMapStore.java          |  31 +++
 ...ore.java => ParentDictionaryMapStore.java} |  62 ++---
 .../TradingStatusDictionaryMapStore.java      |  31 ---
 .../object/PaymentInstructionMapStore.java    |   2 +-
 ...tore.java => PlannerAllTodayMapStore.java} | 134 +++++-----
 .../ru/spcex/clearing/imdg/util/Util.java     |  14 +-
 .../structure/RunnableMapNamesForTesting.java |  14 +-
 .../service/ClearingCalendarService.java      |  75 ++++++
 ...rvice.java => PlannerAllTodayService.java} |  12 +-
 .../scheduler/service/PlannerService.java     |  81 ++++++
 .../service/PlannerTemplateService.java       |  75 ++++++
 .../scheduler/service/SchedulerService.java   |  81 ------
 .../scheduler/service/TimetableService.java   |  75 ------
 .../service/TradingCalendarService.java       |  75 ------
 .../clearing/imdg/IMDGDistributedNames.java   |  14 +-
 .../platform/messaging/domain/Consts.java     |  20 +-
 ...t.java => ClearingCalendarNewRequest.java} |   2 +-
 ...ava => ClearingCalendarUpdateRequest.java} |   2 +-
 ...quest.java => LauncherCommandRequest.java} |   2 +-
 ...NewRequest.java => PlannerNewRequest.java} |   2 +-
 ...st.java => PlannerTemplateNewRequest.java} |   2 +-
 ...java => PlannerTemplateUpdateRequest.java} |   2 +-
 ...Request.java => PlannerUpdateRequest.java} |   2 +-
 52 files changed, 1170 insertions(+), 1163 deletions(-)
 rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/{SchedulerAllTodayController.java => ClearingCalendarController.java} (77%)
 rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/{TaskRunnerController.java => LauncherController.java} (84%)
 rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/{SchedulerController.java => PlanerAllTodayController.java} (72%)
 rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/{TimeTableController.java => PlannerController.java} (80%)
 rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/{TradingCalendarController.java => PlannerTemplateController.java} (78%)
 rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/{TaskRunnerNew.java => LauncherNew.java} (86%)
 rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/{TradingCalendarBackendGetAll.java => ClearingCalendarBackendGetAll.java} (76%)
 rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/{TaskRunnerBackendGetAll.java => LauncherBackendGetAll.java} (61%)
 rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/{TaskRunnerBackendGetFields.java => LauncherBackendGetFields.java} (96%)
 rename clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/rules/{TaskRunnerNewValidationRule.java => LauncherNewValidationRule.java} (80%)
 rename clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/{AdmittedDeal.java => AdmittedDealRegister.java} (93%)
 rename clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/{TradingCalendar.java => ClearingCalendar.java} (90%)
 rename clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/{TaskRunner.java => Launcher.java} (79%)
 rename clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/{Scheduler.java => Planner.java} (92%)
 rename clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/{SchedulerAllToday.java => PlannerAllToday.java} (90%)
 rename clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/{Timetable.java => PlannerTemplate.java} (88%)
 rename clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/{TradingStatusDictionary.java => DayStatusDictionary.java} (77%)
 rename clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/{SourceDictionary.java => ParentDictionary.java} (77%)
 rename clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/{TradingCalendarMapStore.java => ClearingCalendarMapStore.java} (74%)
 rename clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/{TaskRunnerMapStore.java => LauncherMapStore.java} (73%)
 rename clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/{SchedulerMapStore.java => PlannerMapStore.java} (79%)
 rename clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/{TimetableMapStore.java => PlannerTemplateMapStore.java} (75%)
 create mode 100644 clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/DayStatusDictionaryMapStore.java
 rename clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/{SourceDictionaryMapStore.java => ParentDictionaryMapStore.java} (50%)
 delete mode 100644 clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TradingStatusDictionaryMapStore.java
 rename clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/{SchedulerAllTodayMapStore.java => PlannerAllTodayMapStore.java} (76%)
 create mode 100644 clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java
 rename clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/{SchedulerAllTodayService.java => PlannerAllTodayService.java} (65%)
 create mode 100644 clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java
 create mode 100644 clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java
 delete mode 100644 clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerService.java
 delete mode 100644 clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TimetableService.java
 delete mode 100644 clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TradingCalendarService.java
 rename platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/{TradingCalendarNewRequest.java => ClearingCalendarNewRequest.java} (96%)
 rename platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/{TradingCalendarUpdateRequest.java => ClearingCalendarUpdateRequest.java} (96%)
 rename platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/{TaskRunnerCommandRequest.java => LauncherCommandRequest.java} (92%)
 rename platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/{SchedulerNewRequest.java => PlannerNewRequest.java} (98%)
 rename platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/{TimetableNewRequest.java => PlannerTemplateNewRequest.java} (96%)
 rename platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/{TimetableUpdateRequest.java => PlannerTemplateUpdateRequest.java} (96%)
 rename platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/{SchedulerUpdateRequest.java => PlannerUpdateRequest.java} (98%)

diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/SchedulerAllTodayController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/ClearingCalendarController.java
similarity index 77%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/SchedulerAllTodayController.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/ClearingCalendarController.java
index 566a2385f..8183abf01 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/SchedulerAllTodayController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/ClearingCalendarController.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import ru.clearing.classes.statics.data.scheduler.SchedulerAllToday;
+import ru.clearing.classes.statics.data.scheduler.ClearingCalendar;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
@@ -17,21 +17,21 @@ import java.util.Collection;
 import java.util.Map;
 
 @Controller
-@RequestMapping("/schedule/schedulers-all-today")
-public class SchedulerAllTodayController {
+@RequestMapping("/schedule/clearing-calendars")
+public class ClearingCalendarController {
     private final IStateLoader stateLoader;
 
     @Autowired
-    public SchedulerAllTodayController(IStateLoader stateLoader) {
+    public ClearingCalendarController(IStateLoader stateLoader) {
         this.stateLoader = stateLoader;
     }
 
-    @ApiOperation(value = "get all SchedulerAllToday objects.")
+    @ApiOperation(value = "get all clearing calendars.")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public CommonGetAllResponse getAll() {
-        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_SchedulerAllToday, SchedulerAllToday.class);
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_ClearingCalendar, ClearingCalendar.class);
         var response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/TaskRunnerController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/LauncherController.java
similarity index 84%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/TaskRunnerController.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/LauncherController.java
index 22c59eeb7..8285850b8 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/TaskRunnerController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/LauncherController.java
@@ -11,10 +11,10 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import ru.clearing.classes.statics.data.scheduler.TaskRunner;
+import ru.clearing.classes.statics.data.scheduler.Launcher;
 import ru.clearing.classes.statics.data.user.User;
 import ru.spcex.clearing.backendapi.controller.queue.AbstractQueueController;
-import ru.spcex.clearing.backendapi.controller.request.cud.schedule.TaskRunnerNew;
+import ru.spcex.clearing.backendapi.controller.request.cud.schedule.LauncherNew;
 import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
 import ru.spcex.clearing.backendapi.controller.response.cud.CudResponse;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
@@ -34,45 +34,45 @@ import java.util.Map;
 import java.util.concurrent.ExecutionException;
 
 @Controller
-@RequestMapping("/task-runners")
-public class TaskRunnerController extends AbstractQueueController {
+@RequestMapping("/launchers")
+public class LauncherController extends AbstractQueueController {
     private final IStateLoader stateLoader;
     private final Imdg<User> userImdg;
 
     @Autowired
-    public TaskRunnerController(IStateLoader stateLoader, IOperator operator, ImdgProvider imdgProvider) {
+    public LauncherController(IStateLoader stateLoader, IOperator operator, ImdgProvider imdgProvider) {
         super(operator);
         this.stateLoader = stateLoader;
         this.userImdg = imdgProvider.getImdg(IMDGDistributedNames.Map_User, User.class);
     }
 
-    @ApiOperation(value = "get all TaskRunners.")
+    @ApiOperation(value = "get all Launchers.")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public CommonGetAllResponse getAll() {
-        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_TaskRunner, TaskRunner.class);
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_Launcher, Launcher.class);
         var response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;
     }
 
-    @ApiOperation(value = "create task runner.")
+    @ApiOperation(value = "create launcher.")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CudResponse.class), @ApiResponse(code = 400, message = "Ошибка валидации", response = BasicSpcexResponse.class)})
     @RequestMapping(value = "/{task-code}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseBody
     public CudResponse add(@ApiParam(value = "Код задания из taskDictionary", required = true, example = "ABLK")
                                           @PathVariable("task-code") String dictionaryName) throws ExecutionException, InterruptedException {
-        TaskRunnerNew taskRunnerCommand = new TaskRunnerNew();
+        LauncherNew launcherCommand = new LauncherNew();
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
         String username = KeycloakUtils.getUserNameFromAuthentication(authentication);
         User user = userImdg.getSingleObjectByFieldValues(Map.of("identifier", username));
         if (user == null) {
             throw new IllegalStateException("cannot obtain userId from logged in user " + username);
         }
-        taskRunnerCommand.setTask(dictionaryName);
-        taskRunnerCommand.setUserId(user.getId());
-        return processRequest(Consts.TASK_RUNNER_NEW, taskRunnerCommand);
+        launcherCommand.setTask(dictionaryName);
+        launcherCommand.setUserId(user.getId());
+        return processRequest(Consts.LAUNCHER_NEW, launcherCommand);
     }
 
     @Autowired
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/SchedulerController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/PlanerAllTodayController.java
similarity index 72%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/SchedulerController.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/PlanerAllTodayController.java
index e9a611a5e..32919686c 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/SchedulerController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/PlanerAllTodayController.java
@@ -8,9 +8,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import ru.clearing.classes.statics.data.scheduler.Scheduler;
+import ru.clearing.classes.statics.data.scheduler.PlannerAllToday;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
-import ru.spcex.clearing.backendapi.controller.response.entity.schedule.SchedulerBackendGetAll;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 
@@ -18,21 +17,21 @@ import java.util.Collection;
 import java.util.Map;
 
 @Controller
-@RequestMapping("/schedule/schedulers")
-public class SchedulerController {
+@RequestMapping("/schedule/planners-all-today")
+public class PlanerAllTodayController {
     private final IStateLoader stateLoader;
 
     @Autowired
-    public SchedulerController(IStateLoader stateLoader) {
+    public PlanerAllTodayController(IStateLoader stateLoader) {
         this.stateLoader = stateLoader;
     }
 
-    @ApiOperation(value = "get all Schedulers.")
-    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = SchedulerBackendGetAll.class)})
+    @ApiOperation(value = "get all PlannerAllToday objects.")
+    @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public CommonGetAllResponse getAll() {
-        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_Scheduler, Scheduler.class);
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_PlannerAllToday, PlannerAllToday.class);
         var response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/TimeTableController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/PlannerController.java
similarity index 80%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/TimeTableController.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/PlannerController.java
index 0c24dc073..68b926df3 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/TimeTableController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/PlannerController.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import ru.clearing.classes.statics.data.scheduler.Timetable;
+import ru.clearing.classes.statics.data.scheduler.Planner;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
@@ -17,21 +17,21 @@ import java.util.Collection;
 import java.util.Map;
 
 @Controller
-@RequestMapping("/schedule/timetables")
-public class TimeTableController {
+@RequestMapping("/schedule/planners")
+public class PlannerController {
     private final IStateLoader stateLoader;
 
     @Autowired
-    public TimeTableController(IStateLoader stateLoader) {
+    public PlannerController(IStateLoader stateLoader) {
         this.stateLoader = stateLoader;
     }
 
-    @ApiOperation(value = "get all Timetables.")
+    @ApiOperation(value = "get all Planners.")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public CommonGetAllResponse getAll() {
-        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_Timetable, Timetable.class);
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_Planner, Planner.class);
         var response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/TradingCalendarController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/PlannerTemplateController.java
similarity index 78%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/TradingCalendarController.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/PlannerTemplateController.java
index 69c166d8c..43b0578ea 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/TradingCalendarController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/scheduler/PlannerTemplateController.java
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
-import ru.clearing.classes.statics.data.scheduler.TradingCalendar;
+import ru.clearing.classes.statics.data.scheduler.PlannerTemplate;
 import ru.spcex.clearing.backendapi.controller.response.entity.CommonGetAllResponse;
 import ru.spcex.clearing.backendapi.service.IStateLoader;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
@@ -17,21 +17,21 @@ import java.util.Collection;
 import java.util.Map;
 
 @Controller
-@RequestMapping("/schedule/trading-calendars")
-public class TradingCalendarController {
+@RequestMapping("/schedule/planner-templates")
+public class PlannerTemplateController {
     private final IStateLoader stateLoader;
 
     @Autowired
-    public TradingCalendarController(IStateLoader stateLoader) {
+    public PlannerTemplateController(IStateLoader stateLoader) {
         this.stateLoader = stateLoader;
     }
 
-    @ApiOperation(value = "get all trading calendars.")
+    @ApiOperation(value = "get all PlannerTemplates.")
     @ApiResponses(value = {@ApiResponse(code = 200, message = "OK", response = CommonGetAllResponse.class)})
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     public CommonGetAllResponse getAll() {
-        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_TradingCalendar, TradingCalendar.class);
+        Collection<Map<String, Object>> all = stateLoader.getAllMetaTransform(IMDGDistributedNames.Map_PlannerTemplate, PlannerTemplate.class);
         var response = new CommonGetAllResponse();
         response.fromEntity(all);
         return response;
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/TaskRunnerNew.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java
similarity index 86%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/TaskRunnerNew.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java
index 6c10f0c70..76b301904 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/TaskRunnerNew.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/request/cud/schedule/LauncherNew.java
@@ -6,14 +6,14 @@ import io.swagger.annotations.ApiModelProperty;
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
 import ru.spcex.clearing.backendapi.errors.BackEndError;
 import ru.spcex.clearing.platform.messaging.domain.ActionType;
-import ru.spcex.clearing.platform.messaging.domain.cud.schedule.TaskRunnerCommandRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.schedule.LauncherCommandRequest;
 import ru.spcex.platform.utils.enumeration.EnumMessage;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-public class TaskRunnerNew implements IAction<TaskRunnerCommandRequest> {
+public class LauncherNew implements IAction<LauncherCommandRequest> {
     @ApiModelProperty(value = "Идентификатор единоличного исполнительного органа", example = "ABCD")
     @JsonProperty
     private String task;
@@ -22,8 +22,8 @@ public class TaskRunnerNew implements IAction<TaskRunnerCommandRequest> {
     private Long userId;
 
     @Override
-    public TaskRunnerCommandRequest toRequest() {
-        TaskRunnerCommandRequest taskRunnerCommandRequest = new TaskRunnerCommandRequest();
+    public LauncherCommandRequest toRequest() {
+        LauncherCommandRequest taskRunnerCommandRequest = new LauncherCommandRequest();
         taskRunnerCommandRequest.setTaskName(task);
         taskRunnerCommandRequest.setUserId(userId);
         return taskRunnerCommandRequest;
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/ClearingCalendarBackendGetAll.java
similarity index 76%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetAll.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/ClearingCalendarBackendGetAll.java
index 8415770e0..0ae52878f 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TradingCalendarBackendGetAll.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/ClearingCalendarBackendGetAll.java
@@ -3,7 +3,7 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import ru.clearing.classes.statics.data.scheduler.TradingCalendar;
+import ru.clearing.classes.statics.data.scheduler.ClearingCalendar;
 import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
 
 import java.util.ArrayList;
@@ -11,13 +11,13 @@ import java.util.Collection;
 import java.util.List;
 
 @ApiModel(description = "Ответ при получении объектов TradingCalendar.")
-public class TradingCalendarBackendGetAll extends BasicSpcexResponse {
+public class ClearingCalendarBackendGetAll extends BasicSpcexResponse {
 
     @JsonProperty
     @ApiModelProperty(value = "Полезная нагрузка")
-    private TradingCalendarBackendPayload payload = new TradingCalendarBackendPayload();
+    private ClearingCalendarBackendPayload payload = new ClearingCalendarBackendPayload();
 
-    private static class TradingCalendarBackendPayload {
+    private static class ClearingCalendarBackendPayload {
         private List<TradingCalendarBackendGetFields> items = new ArrayList<>();
 
         public List<TradingCalendarBackendGetFields> getItems() {
@@ -29,15 +29,15 @@ public class TradingCalendarBackendGetAll extends BasicSpcexResponse {
         }
     }
 
-    public TradingCalendarBackendPayload getPayload() {
+    public ClearingCalendarBackendPayload getPayload() {
         return payload;
     }
 
-    public void setPayload(TradingCalendarBackendPayload payload) {
+    public void setPayload(ClearingCalendarBackendPayload payload) {
         this.payload = payload;
     }
 
-    public void fromEntity(Collection<TradingCalendar> tradingCalendars) {
+    public void fromEntity(Collection<ClearingCalendar> tradingCalendars) {
         var payload = this.getPayload();
         for (var tradingCalendar : tradingCalendars) {
             var singleItem = new TradingCalendarBackendGetFields();
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TaskRunnerBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetAll.java
similarity index 61%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TaskRunnerBackendGetAll.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetAll.java
index 227ffabff..2f8258b68 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TaskRunnerBackendGetAll.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetAll.java
@@ -3,7 +3,7 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import ru.clearing.classes.statics.data.scheduler.TaskRunner;
+import ru.clearing.classes.statics.data.scheduler.Launcher;
 import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
 
 import java.util.ArrayList;
@@ -11,36 +11,36 @@ import java.util.Collection;
 import java.util.List;
 
 @ApiModel(description = "Ответ при получении объектов TaskRunner.")
-public class TaskRunnerBackendGetAll extends BasicSpcexResponse {
+public class LauncherBackendGetAll extends BasicSpcexResponse {
 
     @JsonProperty
     @ApiModelProperty(value = "Полезная нагрузка")
-    private TaskRunnerBackendPayload payload = new TaskRunnerBackendPayload();
+    private LauncherBackendPayload payload = new LauncherBackendPayload();
 
-    private static class TaskRunnerBackendPayload {
-        private List<TaskRunnerBackendGetFields> items = new ArrayList<>();
+    private static class LauncherBackendPayload {
+        private List<LauncherBackendGetFields> items = new ArrayList<>();
 
-        public List<TaskRunnerBackendGetFields> getItems() {
+        public List<LauncherBackendGetFields> getItems() {
             return items;
         }
 
-        public void setItems(List<TaskRunnerBackendGetFields> items) {
+        public void setItems(List<LauncherBackendGetFields> items) {
             this.items = items;
         }
     }
 
-    public TaskRunnerBackendPayload getPayload() {
+    public LauncherBackendPayload getPayload() {
         return payload;
     }
 
-    public void setPayload(TaskRunnerBackendPayload payload) {
+    public void setPayload(LauncherBackendPayload payload) {
         this.payload = payload;
     }
 
-    public void fromEntity(Collection<TaskRunner> taskRunners) {
+    public void fromEntity(Collection<Launcher> taskRunners) {
         var payload = this.getPayload();
         for (var taskRunner : taskRunners) {
-            var singleItem = new TaskRunnerBackendGetFields();
+            var singleItem = new LauncherBackendGetFields();
             singleItem.setId(taskRunner.getId());
             singleItem.setSenderId(taskRunner.getSenderId());
             singleItem.setTask(taskRunner.getTask());
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TaskRunnerBackendGetFields.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetFields.java
similarity index 96%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TaskRunnerBackendGetFields.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetFields.java
index ef6e688bb..6e4ab702d 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TaskRunnerBackendGetFields.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/LauncherBackendGetFields.java
@@ -6,7 +6,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.serialize.InstantSeriali
 
 import java.time.Instant;
 
-public class TaskRunnerBackendGetFields {
+public class LauncherBackendGetFields {
     @JsonProperty
     private Long id;
     @JsonProperty
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java
index bd557eb60..63561c6e4 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerAllTodayBackendGetAll.java
@@ -3,7 +3,7 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import ru.clearing.classes.statics.data.scheduler.SchedulerAllToday;
+import ru.clearing.classes.statics.data.scheduler.PlannerAllToday;
 import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
 
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ public class SchedulerAllTodayBackendGetAll extends BasicSpcexResponse {
         this.payload = payload;
     }
 
-    public void fromEntity(Collection<SchedulerAllToday> schedulersAllToday) {
+    public void fromEntity(Collection<PlannerAllToday> schedulersAllToday) {
         var payload = this.getPayload();
         for (var schedulerAllToday : schedulersAllToday) {
             var singleItem = new SchedulerAllTodayBackendGetFields();
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetAll.java
index 36b0a1393..28863b431 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetAll.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/SchedulerBackendGetAll.java
@@ -3,7 +3,7 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import ru.clearing.classes.statics.data.scheduler.Scheduler;
+import ru.clearing.classes.statics.data.scheduler.Planner;
 import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
 
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ public class SchedulerBackendGetAll extends BasicSpcexResponse {
         this.payload = payload;
     }
 
-    public void fromEntity(Collection<Scheduler> schedulers) {
+    public void fromEntity(Collection<Planner> schedulers) {
         var payload = this.getPayload();
         for (var scheduler : schedulers) {
             var singleItem = new SchedulerBackendGetFields();
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetAll.java
index ce1a64174..cf7090e33 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetAll.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/schedule/TimetableBackendGetAll.java
@@ -3,7 +3,7 @@ package ru.spcex.clearing.backendapi.controller.response.entity.schedule;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import ru.clearing.classes.statics.data.scheduler.Timetable;
+import ru.clearing.classes.statics.data.scheduler.PlannerTemplate;
 import ru.spcex.clearing.backendapi.controller.response.BasicSpcexResponse;
 
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ public class TimetableBackendGetAll extends BasicSpcexResponse {
         this.payload = payload;
     }
 
-    public void fromEntity(Collection<Timetable> timeTables) {
+    public void fromEntity(Collection<PlannerTemplate> timeTables) {
         var payload = this.getPayload();
         for (var timetable : timeTables) {
             var singleItem = new TimetableBackendGetFields();
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionValidationProvider.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionValidationProvider.java
index d20ff3db8..8a3005e3d 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionValidationProvider.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionValidationProvider.java
@@ -3,10 +3,10 @@ package ru.spcex.clearing.backendapi.service.validation;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Component;
 import ru.clearing.platform.dictionary.AbstractDictionary;
-import ru.spcex.clearing.backendapi.controller.request.cud.schedule.TaskRunnerNew;
+import ru.spcex.clearing.backendapi.controller.request.cud.schedule.LauncherNew;
 import ru.spcex.clearing.backendapi.domain.actions.IAction;
+import ru.spcex.clearing.backendapi.service.validation.rules.LauncherNewValidationRule;
 import ru.spcex.clearing.backendapi.service.validation.rules.PresentById;
-import ru.spcex.clearing.backendapi.service.validation.rules.TaskRunnerNewValidationRule;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.domain.Consts;
 import ru.spcex.platform.classes.base.SpcexObjectBase;
@@ -40,7 +40,7 @@ public class ActionValidationProvider implements InitializingBean {
 
         validators.put(Consts.DESTINATION_MONEY_MARKET_SECURITY_UPDATE, idPresent(IMDGDistributedNames.Map_MoneyMarketSecurity));
         validators.put(Consts.DESTINATION_MONEY_MARKET_SECURITY_DELETE, idPresent(IMDGDistributedNames.Map_MoneyMarketSecurity));
-        validators.put(Consts.TASK_RUNNER_NEW, taskRunnerNew());
+        validators.put(Consts.LAUNCHER_NEW, taskRunnerNew());
     }
 
     @SuppressWarnings("unchecked")
@@ -61,13 +61,13 @@ public class ActionValidationProvider implements InitializingBean {
         };
     }
 
-    private Function<TaskRunnerNew, IValidator> taskRunnerNew() {
+    private Function<LauncherNew, IValidator> taskRunnerNew() {
         return taskRunnerNew -> {
-            ImdgValidationContext<TaskRunnerNew> ctx = new ImdgValidationContext<>();
+            ImdgValidationContext<LauncherNew> ctx = new ImdgValidationContext<>();
             ctx.setValidatedObject(taskRunnerNew);
             ctx.addImdg(IMDGDistributedNames.Map_TaskDictionary, getImdg(IMDGDistributedNames.Map_TaskDictionary, AbstractDictionary.class));
-            ValidatorImpl<ImdgValidationContext<TaskRunnerNew>> iValidator = new ValidatorImpl<>(ctx);
-            iValidator.addRule(TaskRunnerNewValidationRule.knownTaskDictionary);
+            ValidatorImpl<ImdgValidationContext<LauncherNew>> iValidator = new ValidatorImpl<>(ctx);
+            iValidator.addRule(LauncherNewValidationRule.knownTaskDictionary);
             return iValidator;
         };
     }
diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/rules/TaskRunnerNewValidationRule.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/rules/LauncherNewValidationRule.java
similarity index 80%
rename from clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/rules/TaskRunnerNewValidationRule.java
rename to clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/rules/LauncherNewValidationRule.java
index 0b72d0a7d..765ec40e4 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/rules/TaskRunnerNewValidationRule.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/rules/LauncherNewValidationRule.java
@@ -1,7 +1,7 @@
 package ru.spcex.clearing.backendapi.service.validation.rules;
 
 import ru.clearing.platform.dictionary.AbstractDictionary;
-import ru.spcex.clearing.backendapi.controller.request.cud.schedule.TaskRunnerNew;
+import ru.spcex.clearing.backendapi.controller.request.cud.schedule.LauncherNew;
 import ru.spcex.clearing.backendapi.errors.BackEndError;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.platform.imdg.api.Imdg;
@@ -12,11 +12,11 @@ import ru.spcex.platform.utils.validation.IValidationRule;
 import java.util.Map;
 import java.util.Optional;
 
-public enum TaskRunnerNewValidationRule implements IValidationRule<ImdgValidationContext<TaskRunnerNew>> {
+public enum LauncherNewValidationRule implements IValidationRule<ImdgValidationContext<LauncherNew>> {
     knownTaskDictionary() {
         @Override
-        public Optional<EnumMessage> validate(ImdgValidationContext<TaskRunnerNew> context) {
-            TaskRunnerNew validatedObject = context.getValidatedObject();
+        public Optional<EnumMessage> validate(ImdgValidationContext<LauncherNew> context) {
+            LauncherNew validatedObject = context.getValidatedObject();
             Imdg<AbstractDictionary> taskDictionaryImdg = context.obtainMap(IMDGDistributedNames.Map_TaskDictionary, AbstractDictionary.class);
             AbstractDictionary taskEnum = taskDictionaryImdg.getSingleObjectByFieldValues(Map.of("code", validatedObject.getTask()));
             if (taskEnum == null) {
@@ -28,6 +28,6 @@ public enum TaskRunnerNewValidationRule implements IValidationRule<ImdgValidatio
 
     @Override
     public String ruleName() {
-        return "TaskRunnerNewValidationRule." + name();
+        return "LauncherNewValidationRule." + name();
     }
 }
diff --git a/clearing-parent/backend-api/src/main/resources/meta/data.xml b/clearing-parent/backend-api/src/main/resources/meta/data.xml
index be4ee5c59..5fe2fbea7 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/data.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<meta version="0.0.0.0">
+<meta version="1.2.0.0">
 	<enums>
 		<courierType id="1" code="STHS" name="ЭДО с Расчетной Организацией"/>
 		<termType id="1" code="S" name="Срочный"/>
@@ -13,19 +13,24 @@
 		<task id="6" code="ADBC" name="Подтверждение дозачисления/списания остатков"/>
 		<task id="7" code="CORD" name="Формирование сводного платежного поручения"/>
 		<task id="8" code="CORC" name="Получение подтверждения переводов"/>
+		<task id="25" code="GTRD" name="Получение сделок из Торговой системы"/>
 		<task id="34" code="GBLD" name="Поступление средств"/>
 		<task id="35" code="GBDC" name="Подтверждение поступления средств"/>
+		<task id="36" code="GREG" name="Формирование реестров"/>
 		<taskStatus id="1" code="ACTV" name="Активна"/>
 		<taskStatus id="2" code="BLKD" name="Не активна"/>
 		<taskStatus id="3" code="CNCL" name="Отмена расписания"/>
-		<tradingStatus id="1" code="TRAD" name="Торговый"/>
-		<tradingStatus id="2" code="NTRD" name="Неторговый"/>
-		<!--transactionStatus id="1" code="STLD" name="Рассчитан"/>
+		<dayStatus id="1" code="BDAY" name="Рабочий"/>
+		<dayStatus id="2" code="DOFF" name="Нерабочий"/>
+		<transactionStatus id="1" code="STLD" name="Рассчитан"/>
 		<transactionStatus id="2" code="SENT" name="Отправлен в ПРЦ"/>
 		<transactionStatus id="3" code="OK" name="Обработан ПРЦ"/>
-		<transactionStatus id="4" code="FAIL" name="Ошибка ПРЦ"/-->
-		<source id="1" code="TIMT" name="Расписание"/>
-		<source id="2" code="SCHD" name="Планировщик"/>
+		<transactionStatus id="4" code="FAIL" name="Ошибка ПРЦ"/>
+		<transactionStatus id="5" code="CHER" name="Ошибка КС"/>
+		<transactionStatus id="6" code="NSNT" name="Не отправлен в ПРЦ"/>
+		<parent id="1" code="TMPL" name="Шаблон"/>
+		<parent id="2" code="PLNR" name="Расписание"/>
+		<parent id="3" code="CLND" name="Календарь"/>
 		<chargeType id="1" code="PRCT" name="Процент"/>
 		<chargeDirection id="1" code="GET" name="Получить"/>
 		<chargeDirection id="2" code="PAY" name="Заплатить"/>
@@ -53,7 +58,7 @@
 		<serviceStatus id="3" code="SSPD" name="Приостановлен"/>
 		<serviceStatus id="4" code="CLOS" name="Закрыт"/>
 		<serviceStatus id="5" code="ROPN" name="Возобновлен"/>
-		<!--statementType id="1" code="FULL" name="Установка суммы"/-->
+		<statementType id="1" code="FULL" name="Установка суммы"/>
 		<statementType id="2" code="INCR" name="Изменение суммы"/>
 		<operationType id="1" code="STMT" name="Расчетные операции"/>
 		<operationType id="2" code="TRAD" name="Торговые операции"/>
@@ -151,129 +156,135 @@
 		<inOutSDfType id="1" code="0102" name="Входящий ДФ-01/Исходящий ДФ-02"/>
 		<inOutSDfType id="2" code="1617" name="Входящий ДФ-16/Исходящий ДФ-17"/>
 		<inOutSDfType id="3" code="0910" name="Входящий ДФ-09/Исходящий ДФ-10"/>
-		<!--sessionStatus id="1" code="ACTV" name="Сессия активна"/>
-		<sessionStatus id="2" code="CLRN" name="Идет клиринг"/-->
-		<!--objectType id="1" code="STMT" name="STATEMENT"/-->
-		<!--notificationStatus id="1" code="PEND" name="В ожидании"/>
+		<sessionStatus id="1" code="ACTV" name="Сессия активна"/>
+		<sessionStatus id="2" code="CLRN" name="Идет клиринг"/>
+		<sessionStatus id="3" code="CLOS" name="Клиринг завершен"/>
+		<objectType id="1" code="STMT" name="STATEMENT"/>
+		<notificationStatus id="1" code="PEND" name="В ожидании"/>
 		<notificationStatus id="2" code="CNCL" name="Отменено"/>
-		<notificationStatus id="3" code="ACPT" name="Принято"/-->
+		<notificationStatus id="3" code="ACPT" name="Принято"/>
+		<eventType id="1" code="CRET" name="Создание"/>
+		<eventType id="2" code="UPDT" name="Обновление"/>
+		<eventType id="3" code="DELT" name="Удаление"/>
 
 		<currencyCode id="643" code="RUB" name="Российский рубль"/>
 
-		<!-- error code for securities_services -->
-		<errorCode id="1000" code="1000" name="Общая ошибка модуля securities_services."/>
-		<errorCode id="1001" code="1001" name="Нет прав на проведение данной операции."/>
-		<errorCode id="1002" code="1002" name="Не заданы обязательные поля."/>
-		<errorCode id="1003" code="1003" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
-		<errorCode id="1004" code="1004" name="Неверное значение поля %s."/>
-		<errorCode id="1005" code="1005" name="Такая запись уже существует."/>
-		<errorCode id="1006" code="1006" name="Запись не найдена."/>
-		<errorCode id="1007" code="1007" name="Пользователь не найден."/>
-		<errorCode id="1008" code="1008" name="Пользователь неактивен."/>
-		<errorCode id="1010" code="1010" name="Такой Инструмент уже существует."/>
-		<errorCode id="1011" code="1011" name="Инструмент не найден."/>
-		<errorCode id="1012" code="1012" name="Инструмент неактивен."/>
+		<!-- error code for securities-services -->
+		<errorCode id="1000" code="SECR" name="Общая ошибка модуля securities-services."/>
+		<errorCode id="1001" code="SECR" name="Нет прав на проведение данной операции."/>
+		<errorCode id="1002" code="SECR" name="Не заданы обязательные поля."/>
+		<errorCode id="1003" code="SECR" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
+		<errorCode id="1004" code="SECR" name="Неверное значение поля %s."/>
+		<errorCode id="1005" code="SECR" name="Такая запись уже существует."/>
+		<errorCode id="1006" code="SECR" name="Запись не найдена."/>
+		<errorCode id="1007" code="SECR" name="Пользователь не найден."/>
+		<errorCode id="1008" code="SECR" name="Пользователь неактивен."/>
+		<errorCode id="1010" code="SECR" name="Такой Инструмент уже существует."/>
+		<errorCode id="1011" code="SECR" name="Инструмент не найден."/>
+		<errorCode id="1012" code="SECR" name="Инструмент неактивен."/>
 
-		<!-- error code for utility_service -->
-		<errorCode id="2000" code="2000" name="Общая ошибка модуля utility_service"/>
-		<errorCode id="2001" code="2001" name="Нет прав на проведение данной операции."/>
-		<errorCode id="2002" code="2002" name="Не заданы обязательные поля."/>
-		<errorCode id="2003" code="2003" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
-		<errorCode id="2004" code="2004" name="Неверное значение поля %s."/>
-		<errorCode id="2005" code="2005" name="Такая запись уже существует."/>
-		<errorCode id="2006" code="2006" name="Запись не найдена."/>
+		<!-- error code for utility-services -->
+		<errorCode id="2000" code="UTIL" name="Общая ошибка модуля utility-services."/>
+		<errorCode id="2001" code="UTIL" name="Нет прав на проведение данной операции."/>
+		<errorCode id="2002" code="UTIL" name="Не заданы обязательные поля."/>
+		<errorCode id="2003" code="UTIL" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
+		<errorCode id="2004" code="UTIL" name="Неверное значение поля %s."/>
+		<errorCode id="2005" code="UTIL" name="Такая запись уже существует."/>
+		<errorCode id="2006" code="UTIL" name="Запись не найдена."/>
 
-		<!-- error code for company_services -->
-		<errorCode id="3000" code="3000" name="Общая ошибка модуля company_services"/>
-		<errorCode id="3001" code="3001" name="Нет прав на проведение данной операции."/>
-		<errorCode id="3002" code="3002" name="Не заданы обязательные поля."/>
-		<errorCode id="3003" code="3003" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
-		<errorCode id="3004" code="3004" name="Неверное значение поля %s."/>
-		<errorCode id="3005" code="3005" name="Такая запись уже существует."/>
-		<errorCode id="3006" code="3006" name="Запись не найдена."/>
-		<errorCode id="3010" code="3010" name="Такая Компания уже существует"/>
-		<errorCode id="3011" code="3011" name="Компания не найдена."/>
-		<errorCode id="3012" code="3012" name="Компания неактивна."/>
-		<errorCode id="3013" code="3013" name="Профиль Компании не найден."/>
-		<errorCode id="3014" code="3014" name="Реквизит Компании не найден."/>
-		<errorCode id="3015" code="3015" name="Контакт Компании не найден."/>
-		<errorCode id="3016" code="3016" name="Категория Компании не найдена."/>
-		<errorCode id="3017" code="3017" name="Компании уже присвоена Категория %s."/>
+		<!-- error code for company-services -->
+		<errorCode id="3000" code="CMPN" name="Общая ошибка модуля company-services."/>
+		<errorCode id="3001" code="CMPN" name="Нет прав на проведение данной операции."/>
+		<errorCode id="3002" code="CMPN" name="Не заданы обязательные поля."/>
+		<errorCode id="3003" code="CMPN" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
+		<errorCode id="3004" code="CMPN" name="Неверное значение поля %s."/>
+		<errorCode id="3005" code="CMPN" name="Такая запись уже существует."/>
+		<errorCode id="3006" code="CMPN" name="Запись не найдена."/>
+		<errorCode id="3010" code="CMPN" name="Такая Компания уже существует"/>
+		<errorCode id="3011" code="CMPN" name="Компания не найдена."/>
+		<errorCode id="3012" code="CMPN" name="Компания неактивна."/>
+		<errorCode id="3013" code="CMPN" name="Профиль Компании не найден."/>
+		<errorCode id="3014" code="CMPN" name="Реквизит Компании не найден."/>
+		<errorCode id="3015" code="CMPN" name="Контакт Компании не найден."/>
+		<errorCode id="3016" code="CMPN" name="Категория Компании не найдена."/>
+		<errorCode id="3017" code="CMPN" name="Компании уже присвоена Категория %s."/>
 
-		<!-- error code for report_serivces -->
-		<errorCode id="4000" code="4000" name="Общая ошибка модуля report_serivces"/>
+		<!-- error code for report-serivces -->
+		<errorCode id="4000" code="RPRT" name="Общая ошибка модуля report-serivces."/>
 
 		<!-- == error code for processing accounts and balances == -->
-		<!-- error code for account_services -->
-		<errorCode id="5000" code="5000" name="Общая ошибка модуля account_services"/>
-		<errorCode id="5001" code="5001" name="Нет прав на проведение данной операции."/>
-		<errorCode id="5002" code="5002" name="Не заданы обязательные поля."/>
-		<errorCode id="5003" code="5003" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
-		<errorCode id="5004" code="5004" name="Неверное значение поля %s."/>
-		<errorCode id="5005" code="5005" name="Такая запись уже существует."/>
-		<errorCode id="5006" code="5006" name="Запись не найдена."/>
-		<errorCode id="5010" code="5010" name="Счет %s уже существует."/>
-		<errorCode id="5011" code="5011" name="Счет %s не найден."/>
-		<errorCode id="5012" code="5012" name="Счет %s неактивен."/>
-		<errorCode id="5013" code="5013" name="Компания не найдена."/>
-		<errorCode id="5014" code="5014" name="Компания неактивна."/>
-		<!-- error code for balance_services -->
-		<errorCode id="5200" code="5200" name="Общая ошибка модуля balance_services"/>
-		<errorCode id="5210" code="5210" name="Клиринговая сессия неактивна."/>
-		<errorCode id="5211" code="5211" name="Компания не найдена."/>
-		<errorCode id="5212" code="5212" name="Компания неактивна."/>
-		<errorCode id="5213" code="5213" name="Валюта не найдена."/>
-		<errorCode id="5214" code="5214" name="Загрузка остатков возможна только на текущую дату."/>
-		<errorCode id="5215" code="5215" name="Загрузка остатков возможна только по рынку МКР."/>
-		<errorCode id="5216" code="5216" name="Загрузка остатков возможна только по собственным счетам."/>
-		<errorCode id="5217" code="5217" name="Счет %s не найден."/>
-		<errorCode id="5218" code="5218" name="Счет %s неактивен."/>
-		<errorCode id="5219" code="5219" name="Дозачисления/списания возможны только по рынку МКР."/>
-		<errorCode id="5220" code="5220" name="Сумма списания превышает сумму средств на счете."/>
-		<errorCode id="5221" code="5221" name="Поступление средств возможно только по рынку МКР."/>
-		<errorCode id="5222" code="5222" name="Сумма списания превышает сумму средств на счете."/>
-		<!-- error code for проведение расчетов -->
-		<errorCode id="5400" code="5400" name="Общая ошибка модуля проведения расчетов"/>
-		<!-- error code for dbf-loader -->
-		<errorCode id="5600" code="5600" name="Общая ошибка модуля dbf-loader"/>
-		<!-- error code for dbf-export -->
-		<errorCode id="5800" code="5800" name="Общая ошибка модуля dbf-export"/>
+		<!-- error code for account-services -->
+		<errorCode id="5000" code="ACNT" name="Общая ошибка модуля account-services."/>
+		<errorCode id="5001" code="ACNT" name="Нет прав на проведение данной операции."/>
+		<errorCode id="5002" code="ACNT" name="Не заданы обязательные поля."/>
+		<errorCode id="5003" code="ACNT" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
+		<errorCode id="5004" code="ACNT" name="Неверное значение поля %s."/>
+		<errorCode id="5005" code="ACNT" name="Такая запись уже существует."/>
+		<errorCode id="5006" code="ACNT" name="Запись не найдена."/>
+		<errorCode id="5010" code="ACNT" name="Счет %s уже существует."/>
+		<errorCode id="5011" code="ACNT" name="Счет %s не найден."/>
+		<errorCode id="5012" code="ACNT" name="Счет %s неактивен."/>
+		<errorCode id="5013" code="ACNT" name="Компания не найдена."/>
+		<errorCode id="5014" code="ACNT" name="Компания неактивна."/>
+		<!-- error code for balance-services -->
+		<errorCode id="5200" code="BLNC" name="Общая ошибка модуля balance-services."/>
+		<errorCode id="5210" code="BLNC" name="Клиринговая сессия неактивна."/>
+		<errorCode id="5211" code="BLNC" name="Компания не найдена."/>
+		<errorCode id="5212" code="BLNC" name="Компания неактивна."/>
+		<errorCode id="5213" code="BLNC" name="Валюта не найдена."/>
+		<errorCode id="5214" code="BLNC" name="Загрузка остатков возможна только на текущую дату."/>
+		<errorCode id="5215" code="BLNC" name="Загрузка остатков возможна только по рынку МКР."/>
+		<errorCode id="5216" code="BLNC" name="Загрузка остатков возможна только по собственным счетам."/>
+		<errorCode id="5217" code="BLNC" name="Счет %s не найден."/>
+		<errorCode id="5218" code="BLNC" name="Счет %s неактивен."/>
+		<errorCode id="5219" code="BLNC" name="Дозачисления/списания возможны только по рынку МКР."/>
+		<errorCode id="5220" code="BLNC" name="Сумма списания превышает сумму средств на счете."/>
+		<errorCode id="5221" code="BLNC" name="Поступление средств возможно только по рынку МКР."/>
+		<errorCode id="5222" code="BLNC" name="Сумма списания превышает сумму средств на счете."/>
+		<!-- error code for clearing-services -->
+		<errorCode id="5400" code="CLRN" name="Общая ошибка модуля clearing-services."/>
+		<errorCode id="5401" code="CLRN" name="Нет прав на проведение данной операции."/>
+		<errorCode id="5402" code="CLRN" name="Не заданы обязательные поля."/>
+		<errorCode id="5403" code="CLRN" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
+		<errorCode id="5404" code="CLRN" name="Неверное значение поля %s."/>
+		<errorCode id="5405" code="CLRN" name="Такая запись уже существует."/>
+		<errorCode id="5406" code="CLRN" name="Запись не найдена."/>
+		<errorCode id="5407" code="CLRN" name="Пользователь не найден."/>
+		<errorCode id="5408" code="CLRN" name="Пользователь неактивен."/>
+		<errorCode id="5410" code="CLRN" name="Компания не найдена."/>
+		<errorCode id="5411" code="CLRN" name="Компания неактивна."/>
+		<errorCode id="5412" code="CLRN" name="У компании %s не сошлась сумма кредит-проводок."/>
+ 		<errorCode id="5413" code="CLRN" name="У компании %s не сошлась сумма дебет-проводок."/>
+		<!-- error code for dbf-importer -->
+		<errorCode id="5600" code="DBFI" name="Общая ошибка модуля dbf-importer."/>
+		<!-- error code for dbf-exporter -->
+		<errorCode id="5800" code="DBFE" name="Общая ошибка модуля dbf-exporter."/>
 
 		<!-- error code for api-lk-company -->
-		<errorCode id="6000" code="6000" name="Общая ошибка модуля api-lk-company"/>
-
-		<!-- error code for scheduler_service -->
-		<errorCode id="7000" code="7000" name="Общая ошибка модуля scheduler_service"/>
-		<errorCode id="7001" code="7001" name="Нет прав на проведение данной операции."/>
-		<errorCode id="7002" code="7002" name="Не заданы обязательные поля."/>
-		<errorCode id="7003" code="7003" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
-		<errorCode id="7004" code="7004" name="Неверное значение поля %s."/>
-		<errorCode id="7005" code="7005" name="Такая запись уже существует."/>
-		<errorCode id="7006" code="7006" name="Запись не найдена."/>
-		<errorCode id="7010" code="7010" name="Невозможно добавить задачу на прошедшую дату."/>
-		<errorCode id="7011" code="7011" name="Невозможно добавить задачу на прошедшее время."/>
-		<errorCode id="7012" code="7012" name="Указанный в задаче нструмент не найден."/>
-		<errorCode id="7013" code="7013" name="Указанный инструмент неактивен."/>
-		<errorCode id="7014" code="7014" name="Указанная в задаче компания не найдена."/>
-		<errorCode id="7015" code="7015" name="Указанная компания неактивна."/>
-
-		<!-- error code for utility_service -->
-		<errorCode id="8000" code="8000" name="Общая ошибка модуля utility_service"/>
-		<errorCode id="8001" code="8001" name="Нет прав на проведение данной операции."/>
-		<errorCode id="8002" code="8002" name="Не заданы обязательные поля."/>
-		<errorCode id="8003" code="8003" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
-		<errorCode id="8004" code="8004" name="Неверное значение поля %s."/>
-		<errorCode id="8005" code="8005" name="Такая запись уже существует."/>
-		<errorCode id="8006" code="8006" name="Запись не найдена."/>
-		<!-- error code for backend_api -->
-
-		<errorCode id="9000" code="9000" name="Ошибка проверки поля %s"/>
-		<errorCode id="9001" code="9001" name="Неопознанное значение json свойства %s"/>
-		<errorCode id="9002" code="9002" name="Не удалось обработать http сообщение"/>
-		<errorCode id="9003" code="9003" name="Keycloak роли содержат дубликаты"/>
-		<errorCode id="9004" code="9004" name="Не может обнаружитьт словарь %s"/>
-		<errorCode id="9005" code="9005" name="Не найдено ресурс %s"/>
+		<errorCode id="6000" code="APIC" name="Общая ошибка модуля api-lk-company."/>
 
+		<!-- error code for scheduler-services -->
+		<errorCode id="7000" code="SCHD" name="Общая ошибка модуля scheduler-services."/>
+		<errorCode id="7001" code="SCHD" name="Нет прав на проведение данной операции."/>
+		<errorCode id="7002" code="SCHD" name="Не заданы обязательные поля."/>
+		<errorCode id="7003" code="SCHD" name="Запись с указанным идентификатором в справочнике %s не найдена."/>
+		<errorCode id="7004" code="SCHD" name="Неверное значение поля %s."/>
+		<errorCode id="7005" code="SCHD" name="Такая запись уже существует."/>
+		<errorCode id="7006" code="SCHD" name="Запись не найдена."/>
+		<errorCode id="7010" code="SCHD" name="Невозможно добавить задачу на прошедшую дату."/>
+		<errorCode id="7011" code="SCHD" name="Невозможно добавить задачу на прошедшее время."/>
+		<errorCode id="7012" code="SCHD" name="Указанный в задаче нструмент не найден."/>
+		<errorCode id="7013" code="SCHD" name="Указанный инструмент неактивен."/>
+		<errorCode id="7014" code="SCHD" name="Указанная в задаче компания не найдена."/>
+		<errorCode id="7015" code="SCHD" name="Указанная компания неактивна."/>
+        
+		<!-- error code for backend-api -->
+		<errorCode id="9000" code="BAPI" name="Ошибка проверки поля %s."/>
+		<errorCode id="9001" code="BAPI" name="Неопознанное значение json свойства %s."/>
+		<errorCode id="9002" code="BAPI" name="Не удалось обработать http сообщение."/>
+		<errorCode id="9003" code="BAPI" name="Keycloak роли содержат дубликаты."/>
+		<errorCode id="9004" code="BAPI" name="Не может обнаружитьт словарь %s."/>
+		<errorCode id="9005" code="BAPI" name="Не найдено ресурс %s."/>
 
 	</enums>
 	<objects>
diff --git a/clearing-parent/backend-api/src/main/resources/meta/meta.xml b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
index 877c67b00..a14fe0008 100644
--- a/clearing-parent/backend-api/src/main/resources/meta/meta.xml
+++ b/clearing-parent/backend-api/src/main/resources/meta/meta.xml
@@ -39,7 +39,7 @@
 			<code name="Код" shortname="Код" type="12"/>
             <name name="Статус" shortname="Статус" type="2" length="50"/>
         </taskStatus>
-        <dayStatus name="Справочник статусов дней" class="com.spicex.dictionary.DayStatusDictionary" table="day_status_dictionary">
+        <dayStatus name="Справочник статусов дней" class="ru.clearing.platform.dictionary.DayStatusDictionary" table="day_status_dictionary">
             <id name="Идентификатор записи" shortname="ID" type="1"/>
 			<code name="Код" shortname="Код" type="12"/>
             <name name="Статус дня" shortname="Статус" type="2" length="50"/>
@@ -293,7 +293,7 @@
             <errorCode type="1" name="Код ошибки" shortname="Код ошибки" searchable="true" sortable="true" link="errorCode" linkCode="code"/>
             <errorText type="12" name="Полный текст ошибки" shortname="Ошибка" searchable="true" sortable="true" link="errorText" linkCode="text"/>
         </userConnect>
-        <plannerTemplate name="Шаблон расписания операционного дня" class="ru.clearing.classes.statics.data.scheduler.Timetable" table="planner_template">
+        <plannerTemplate name="Шаблон расписания операционного дня" class="ru.clearing.classes.statics.data.scheduler.PlannerTemplate" table="planner_template">
             <id type="1" name="Идентификатор" shortname="ID" searchable="true" sortable="true" visible="true"/>
             <createdAt field="created" type="4" name="Создано" shortname="Создано" searchable="true" sortable="true"/>
             <updatedAt field="updated" type="4" name="Изменено" shortname="Изменено" searchable="true" sortable="true"/>
@@ -317,7 +317,7 @@
 				</delete>
 			</actions>
         </plannerTemplate>
-        <clearingCalendar name="Рабочие и нерабочие дни" class="ru.clearing.classes.statics.data.scheduler.TradingCalendar" table="clearing_calendar">
+        <clearingCalendar name="Рабочие и нерабочие дни" class="ru.clearing.classes.statics.data.scheduler.ClearingCalendar" table="clearing_calendar">
             <id type="1" name="Идентификатор" shortname="ID" searchable="true" sortable="true" visible="true"/>
             <createdAt field="created" type="4" name="Создано" shortname="Создано" searchable="true" sortable="true"/>
             <updatedAt field="updated" type="4" name="Изменено" shortname="Изменено" searchable="true" sortable="true"/>
@@ -341,7 +341,7 @@
 				</delete>
 			</actions>
         </clearingCalendar>
-        <planner name="Расписание" class="ru.clearing.classes.statics.data.scheduler.Scheduler" table="planner">
+        <planner name="Расписание" class="ru.clearing.classes.statics.data.scheduler.Planner" table="planner">
             <id type="1" name="Идентификатор" shortname="ID" searchable="true" sortable="true" visible="true"/>
             <createdAt field="created" type="4" name="Создано" shortname="Создано" searchable="true" sortable="true"/>
             <updatedAt field="updated" type="4" name="Изменено" shortname="Изменено" searchable="true" sortable="true"/>
@@ -374,7 +374,7 @@
 				</delete>
 			</actions>
         </planner>
-        <plannerAllToday name="Расписание на текущий день" class="ru.clearing.classes.statics.data.scheduler.SchedulerAllToday" table="planner_all_today">
+        <plannerAllToday name="Расписание на текущий день" class="ru.clearing.classes.statics.data.scheduler.PlannerAllToday" table="planner_all_today">
             <id type="1" name="Идентификатор" shortname="ID" searchable="true" sortable="true" visible="true"/>
             <task type="12" name="Идентификатор задачи" shortname="Задача" searchable="true" sortable="true" visible="true" link="task"/>
             <taskTime type="5" name="Время" shortname="Время" searchable="true" sortable="true" visible="true"/>
@@ -385,7 +385,7 @@
             <parent type="12" name="Источник записи расписания" shortname="Источник" searchable="true" sortable="true" link="parent"/>
             <parentId type="1" name="Идентификатор источника" shortname="ID" searchable="false" sortable="false"/>
         </plannerAllToday>
-        <launcher name="Запуск задачи" class="ru.clearing.classes.statics.data.scheduler.TaskRunner" table="launcher_request">
+        <launcher name="Запуск задачи" class="ru.clearing.classes.statics.data.scheduler.Launcher" table="launcher_request">
             <id type="1" name="Идентификатор" shortname="ID" searchable="true" sortable="true" visible="true"/>
             <createdAt field="created" type="4" name="Создано" shortname="Создано" searchable="true" sortable="true"/>
             <updatedAt field="updated" type="4" name="Изменено" shortname="Изменено" searchable="true" sortable="true"/>
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDeal.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDealRegister.java
similarity index 93%
rename from clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDeal.java
rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDealRegister.java
index b83f356d8..e2bb3eb72 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDeal.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/misc/AdmittedDealRegister.java
@@ -12,7 +12,7 @@ import java.time.LocalTime;
  * <p>
  * DB table: ADMITTED_DEAL
  **/
-public class AdmittedDeal extends BusinessObject {
+public class AdmittedDealRegister extends BusinessObject {
     private static final long serialVersionUID = ConstSerializable.serialVersionUID;
 
     private String companyFullName;
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TradingCalendar.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java
similarity index 90%
rename from clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TradingCalendar.java
rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java
index d45f477d6..6ce41e7f3 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TradingCalendar.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/ClearingCalendar.java
@@ -1,44 +1,44 @@
-package ru.clearing.classes.statics.data.scheduler;
-
-import ru.clearing.classes.ConstSerializable;
-import ru.clearing.classes.objects.BusinessObject;
-
-import java.time.LocalDate;
-
-/**
- * Торговые и неторговые дни
- * <p>
- * DB table: TRADING_CALENDAR
- **/
-public class TradingCalendar extends BusinessObject {
-    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
-
-    private LocalDate clearingDate;
-    private Long companyId;
-    private String tradingStatus;
-
-    public LocalDate getClearingDate() {
-        return clearingDate;
-    }
-
-    public void setClearingDate(LocalDate value) {
-        this.clearingDate = value;
-    }
-
-    public Long getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Long value) {
-        this.companyId = value;
-    }
-
-    public String getTradingStatus() {
-        return tradingStatus;
-    }
-
-    public void setTradingStatus(String value) {
-        this.tradingStatus = value;
-    }
-
+package ru.clearing.classes.statics.data.scheduler;
+
+import ru.clearing.classes.ConstSerializable;
+import ru.clearing.classes.objects.BusinessObject;
+
+import java.time.LocalDate;
+
+/**
+ * Торговые и неторговые дни
+ * <p>
+ * DB table: TRADING_CALENDAR
+ **/
+public class ClearingCalendar extends BusinessObject {
+    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
+    private LocalDate clearingDate;
+    private Long companyId;
+    private String tradingStatus;
+
+    public LocalDate getClearingDate() {
+        return clearingDate;
+    }
+
+    public void setClearingDate(LocalDate value) {
+        this.clearingDate = value;
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long value) {
+        this.companyId = value;
+    }
+
+    public String getTradingStatus() {
+        return tradingStatus;
+    }
+
+    public void setTradingStatus(String value) {
+        this.tradingStatus = value;
+    }
+
 }
\ No newline at end of file
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TaskRunner.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Launcher.java
similarity index 79%
rename from clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TaskRunner.java
rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Launcher.java
index 50c571b23..9fa2e37e4 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/TaskRunner.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Launcher.java
@@ -1,36 +1,33 @@
-package ru.clearing.classes.statics.data.scheduler;
-
-import ru.clearing.classes.ConstSerializable;
-import ru.clearing.classes.objects.BusinessObject;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
-
-import java.time.Instant;
-
-/**
- * Запуск задачи
- * <p>
- * DB table: TASK_RUNNER
- **/
-public class TaskRunner extends BusinessObject {
-    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
-
-    private Long senderId;
-    private String task;
-
-    public Long getSenderId() {
-        return senderId;
-    }
-
-    public void setSenderId(Long value) {
-        this.senderId = value;
-    }
-
-    public String getTask() {
-        return task;
-    }
-
-    public void setTask(String value) {
-        this.task = value;
-    }
-
+package ru.clearing.classes.statics.data.scheduler;
+
+import ru.clearing.classes.ConstSerializable;
+import ru.clearing.classes.objects.BusinessObject;
+
+/**
+ * Запуск задачи
+ * <p>
+ * DB table: TASK_RUNNER
+ **/
+public class Launcher extends BusinessObject {
+    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
+    private Long senderId;
+    private String task;
+
+    public Long getSenderId() {
+        return senderId;
+    }
+
+    public void setSenderId(Long value) {
+        this.senderId = value;
+    }
+
+    public String getTask() {
+        return task;
+    }
+
+    public void setTask(String value) {
+        this.task = value;
+    }
+
 }
\ No newline at end of file
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Scheduler.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java
similarity index 92%
rename from clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Scheduler.java
rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java
index c2f2d6868..c29e8ba80 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Scheduler.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Planner.java
@@ -1,73 +1,73 @@
-package ru.clearing.classes.statics.data.scheduler;
-
-import ru.clearing.classes.ConstSerializable;
-import ru.clearing.classes.objects.BusinessObject;
-
-import java.time.LocalDate;
-import java.time.LocalTime;
-
-/**
- * Расписание планировщика
- * <p>
- * DB table: SCHEDULER
- **/
-public class Scheduler extends BusinessObject {
-    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
-
-    private String task;
-    private LocalTime taskTime;
-    private LocalDate clearingDate;
-    private String market;
-    private String taskStatus;
-    private Long securityId;
-
-
-    public String getTask() {
-        return task;
-    }
-
-    public void setTask(String value) {
-        this.task = value;
-    }
-
-    public LocalTime getTaskTime() {
-        return taskTime;
-    }
-
-    public void setTaskTime(LocalTime value) {
-        this.taskTime = value;
-    }
-
-    public LocalDate getClearingDate() {
-        return clearingDate;
-    }
-
-    public void setClearingDate(LocalDate value) {
-        this.clearingDate = value;
-    }
-
-    public String getMarket() {
-        return market;
-    }
-
-    public void setMarket(String value) {
-        this.market = value;
-    }
-
-    public String getTaskStatus() {
-        return taskStatus;
-    }
-
-    public void setTaskStatus(String value) {
-        this.taskStatus = value;
-    }
-
-    public Long getSecurityId() {
-        return securityId;
-    }
-
-    public void setSecurityId(Long value) {
-        this.securityId = value;
-    }
-
-}
+package ru.clearing.classes.statics.data.scheduler;
+
+import ru.clearing.classes.ConstSerializable;
+import ru.clearing.classes.objects.BusinessObject;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+/**
+ * Расписание планировщика
+ * <p>
+ * DB table: SCHEDULER
+ **/
+public class Planner extends BusinessObject {
+    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
+    private String task;
+    private LocalTime taskTime;
+    private LocalDate clearingDate;
+    private String market;
+    private String taskStatus;
+    private Long securityId;
+
+
+    public String getTask() {
+        return task;
+    }
+
+    public void setTask(String value) {
+        this.task = value;
+    }
+
+    public LocalTime getTaskTime() {
+        return taskTime;
+    }
+
+    public void setTaskTime(LocalTime value) {
+        this.taskTime = value;
+    }
+
+    public LocalDate getClearingDate() {
+        return clearingDate;
+    }
+
+    public void setClearingDate(LocalDate value) {
+        this.clearingDate = value;
+    }
+
+    public String getMarket() {
+        return market;
+    }
+
+    public void setMarket(String value) {
+        this.market = value;
+    }
+
+    public String getTaskStatus() {
+        return taskStatus;
+    }
+
+    public void setTaskStatus(String value) {
+        this.taskStatus = value;
+    }
+
+    public Long getSecurityId() {
+        return securityId;
+    }
+
+    public void setSecurityId(Long value) {
+        this.securityId = value;
+    }
+
+}
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/SchedulerAllToday.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java
similarity index 90%
rename from clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/SchedulerAllToday.java
rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java
index 764287c2d..9850ef734 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/SchedulerAllToday.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerAllToday.java
@@ -1,90 +1,90 @@
-package ru.clearing.classes.statics.data.scheduler;
-
-import ru.clearing.classes.ConstSerializable;
-import ru.spcex.platform.classes.base.SpcexObjectBase;
-
-import java.time.LocalDate;
-import java.time.LocalTime;
-
-/**
- * Расписание на текущий день
- * <p>
- * DB table: SCHEDULER_ALL_TODAY
- **/
-public class SchedulerAllToday extends SpcexObjectBase {
-    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
-
-    private String task;
-    private LocalTime taskTime;
-    private LocalDate clearingDate;
-    private String market;
-    private String taskStatus;
-    private Long securityId;
-    private String source;
-    private Long origId;
-
-    public String getTask() {
-        return task;
-    }
-
-    public void setTask(String value) {
-        this.task = value;
-    }
-
-    public LocalTime getTaskTime() {
-        return taskTime;
-    }
-
-    public void setTaskTime(LocalTime value) {
-        this.taskTime = value;
-    }
-
-    public LocalDate getClearingDate() {
-        return clearingDate;
-    }
-
-    public void setClearingDate(LocalDate value) {
-        this.clearingDate = value;
-    }
-
-    public String getMarket() {
-        return market;
-    }
-
-    public void setMarket(String value) {
-        this.market = value;
-    }
-
-    public String getTaskStatus() {
-        return taskStatus;
-    }
-
-    public void setTaskStatus(String value) {
-        this.taskStatus = value;
-    }
-
-    public Long getSecurityId() {
-        return securityId;
-    }
-
-    public void setSecurityId(Long value) {
-        this.securityId = value;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String value) {
-        this.source = value;
-    }
-
-    public Long getOrigId() {
-        return origId;
-    }
-
-    public void setOrigId(Long value) {
-        this.origId = value;
-    }
-
+package ru.clearing.classes.statics.data.scheduler;
+
+import ru.clearing.classes.ConstSerializable;
+import ru.spcex.platform.classes.base.SpcexObjectBase;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+/**
+ * Расписание на текущий день
+ * <p>
+ * DB table: PLANNER_ALL_TODAY
+ **/
+public class PlannerAllToday extends SpcexObjectBase {
+    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
+    private String task;
+    private LocalTime taskTime;
+    private LocalDate clearingDate;
+    private String market;
+    private String taskStatus;
+    private Long securityId;
+    private String source;
+    private Long origId;
+
+    public String getTask() {
+        return task;
+    }
+
+    public void setTask(String value) {
+        this.task = value;
+    }
+
+    public LocalTime getTaskTime() {
+        return taskTime;
+    }
+
+    public void setTaskTime(LocalTime value) {
+        this.taskTime = value;
+    }
+
+    public LocalDate getClearingDate() {
+        return clearingDate;
+    }
+
+    public void setClearingDate(LocalDate value) {
+        this.clearingDate = value;
+    }
+
+    public String getMarket() {
+        return market;
+    }
+
+    public void setMarket(String value) {
+        this.market = value;
+    }
+
+    public String getTaskStatus() {
+        return taskStatus;
+    }
+
+    public void setTaskStatus(String value) {
+        this.taskStatus = value;
+    }
+
+    public Long getSecurityId() {
+        return securityId;
+    }
+
+    public void setSecurityId(Long value) {
+        this.securityId = value;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String value) {
+        this.source = value;
+    }
+
+    public Long getOrigId() {
+        return origId;
+    }
+
+    public void setOrigId(Long value) {
+        this.origId = value;
+    }
+
 }
\ No newline at end of file
diff --git a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Timetable.java b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerTemplate.java
similarity index 88%
rename from clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Timetable.java
rename to clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerTemplate.java
index d6dc9de82..4b0dfea56 100644
--- a/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/Timetable.java
+++ b/clearing-parent/classes/src/main/java/ru/clearing/classes/statics/data/scheduler/PlannerTemplate.java
@@ -1,44 +1,44 @@
-package ru.clearing.classes.statics.data.scheduler;
-
-import ru.clearing.classes.ConstSerializable;
-import ru.clearing.classes.objects.BusinessObject;
-
-import java.time.LocalTime;
-
-/**
- * Постоянное расписание операционного дня
- * <p>
- * DB table: TIMETABLE
- **/
-public class Timetable extends BusinessObject {
-    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
-
-    private String task;
-    private LocalTime taskTime;
-    private String taskStatus;
-
-    public String getTask() {
-        return task;
-    }
-
-    public void setTask(String value) {
-        this.task = value;
-    }
-
-    public LocalTime getTaskTime() {
-        return taskTime;
-    }
-
-    public void setTaskTime(LocalTime value) {
-        this.taskTime = value;
-    }
-
-    public String getTaskStatus() {
-        return taskStatus;
-    }
-
-    public void setTaskStatus(String value) {
-        this.taskStatus = value;
-    }
-
+package ru.clearing.classes.statics.data.scheduler;
+
+import ru.clearing.classes.ConstSerializable;
+import ru.clearing.classes.objects.BusinessObject;
+
+import java.time.LocalTime;
+
+/**
+ * Постоянное расписание операционного дня
+ * <p>
+ * DB table: PLANNER_TEMPLATE
+ **/
+public class PlannerTemplate extends BusinessObject {
+    private static final long serialVersionUID = ConstSerializable.serialVersionUID;
+
+    private String task;
+    private LocalTime taskTime;
+    private String taskStatus;
+
+    public String getTask() {
+        return task;
+    }
+
+    public void setTask(String value) {
+        this.task = value;
+    }
+
+    public LocalTime getTaskTime() {
+        return taskTime;
+    }
+
+    public void setTaskTime(LocalTime value) {
+        this.taskTime = value;
+    }
+
+    public String getTaskStatus() {
+        return taskStatus;
+    }
+
+    public void setTaskStatus(String value) {
+        this.taskStatus = value;
+    }
+
 }
\ No newline at end of file
diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingError.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingError.java
index 24106521d..dfaacf56d 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingError.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/error/ClearingError.java
@@ -3,8 +3,8 @@ package ru.spcex.clearing.error;
 import ru.spcex.platform.utils.enumeration.IEnumId;
 
 public enum ClearingError implements IEnumId {
-    CompanyCreditCheck(10012L),
-    CompanyDebitCheck(10013L),
+    CompanyCreditCheck(5412L),
+    CompanyDebitCheck(5413L),
     ;
     private final Long id;
 
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TradingStatusDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/DayStatusDictionary.java
similarity index 77%
rename from clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TradingStatusDictionary.java
rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/DayStatusDictionary.java
index 8046d202b..23cfb004e 100644
--- a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/TradingStatusDictionary.java
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/DayStatusDictionary.java
@@ -1,11 +1,11 @@
-package ru.clearing.platform.dictionary;
-
-/**
- * Справочник торговых статусов
- *
- * Dictionary DB table: TRADING_STATUS_DICTIONARY
- **/
-public class TradingStatusDictionary extends AbstractDictionary {
-    private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
-
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник торговых статусов
+ *
+ * Dictionary DB table: TRADING_STATUS_DICTIONARY
+ **/
+public class DayStatusDictionary extends AbstractDictionary {
+    private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
 }
\ No newline at end of file
diff --git a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/SourceDictionary.java b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ParentDictionary.java
similarity index 77%
rename from clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/SourceDictionary.java
rename to clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ParentDictionary.java
index 48c4c0875..19639960b 100644
--- a/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/SourceDictionary.java
+++ b/clearing-parent/dictionary/src/main/java/ru/clearing/platform/dictionary/ParentDictionary.java
@@ -1,11 +1,11 @@
-package ru.clearing.platform.dictionary;
-
-/**
- * Справочник источников
- *
- * Dictionary DB table: SOURCE_DICTIONARY
- **/
-public class SourceDictionary extends AbstractDictionary {
-    private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
-
+package ru.clearing.platform.dictionary;
+
+/**
+ * Справочник источников
+ *
+ * Dictionary DB table: SOURCE_DICTIONARY
+ **/
+public class ParentDictionary extends AbstractDictionary {
+    private static final long serialVersionUID = ConstDictionarySerializable.serialVersionUID;
+
 }
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingCalendarMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ClearingCalendarMapStore.java
similarity index 74%
rename from clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingCalendarMapStore.java
rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ClearingCalendarMapStore.java
index 555353445..453dbe661 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TradingCalendarMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/ClearingCalendarMapStore.java
@@ -1,62 +1,62 @@
-package ru.spcex.clearing.imdg.businessobject;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-import ru.clearing.classes.statics.data.scheduler.TradingCalendar;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.imdg.base.TemplateMapStore;
-import ru.spcex.platform.utils.time.TimeUtil;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-@Component
-public class TradingCalendarMapStore extends TemplateMapStore<TradingCalendar> {
-
-    public TradingCalendarMapStore(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate);
-    }
-
-    @Override
-    public String getMapName() {
-        return IMDGDistributedNames.Map_TradingCalendar;
-    }
-
-    @Override
-    public String getTableName() {
-        return "TRADING_CALENDAR";
-    }
-
-    @Override
-    public String[] getFields() {
-        return new String[]{
-                "ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "COMPANY_ID", "TRADING_STATUS"
-        };
-    }
-
-    @Override
-    public TradingCalendar objectReader(ResultSet resultSet) throws SQLException {
-        TradingCalendar object = new TradingCalendar();
-        object.setId(resultSet.getObject("ID", Long.class));
-        object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
-        object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
-        object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
-        object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
-        object.setTradingStatus(resultSet.getObject("TRADING_STATUS", String.class));
-        return object;
-    }
-
-    @Override
-    public Object[] objectToField(TradingCalendar object) {
-        Object[] args = new Object[]{
-                object.getId(),
-                TimeUtil.toDateFromInstant(object.getCreated()),
-                TimeUtil.toDateFromInstant(object.getUpdated()),
-                TimeUtil.toDateFromLocalDate(object.getClearingDate()),
-                object.getCompanyId(),
-                object.getTradingStatus()
-        };
-        return args;
-    }
-
+package ru.spcex.clearing.imdg.businessobject;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.classes.statics.data.scheduler.ClearingCalendar;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.imdg.base.TemplateMapStore;
+import ru.spcex.platform.utils.time.TimeUtil;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+@Component
+public class ClearingCalendarMapStore extends TemplateMapStore<ClearingCalendar> {
+
+    public ClearingCalendarMapStore(JdbcTemplate jdbcTemplate) {
+        super(jdbcTemplate);
+    }
+
+    @Override
+    public String getMapName() {
+        return IMDGDistributedNames.Map_ClearingCalendar;
+    }
+
+    @Override
+    public String getTableName() {
+        return "CLEARING_CALENDAR";
+    }
+
+    @Override
+    public String[] getFields() {
+        return new String[]{
+                "ID", "CREATED_AT", "UPDATED_AT", "CLEARING_DATE", "COMPANY_ID", "TRADING_STATUS"
+        };
+    }
+
+    @Override
+    public ClearingCalendar objectReader(ResultSet resultSet) throws SQLException {
+        ClearingCalendar object = new ClearingCalendar();
+        object.setId(resultSet.getObject("ID", Long.class));
+        object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
+        object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
+        object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
+        object.setCompanyId(resultSet.getObject("COMPANY_ID", Long.class));
+        object.setTradingStatus(resultSet.getObject("TRADING_STATUS", String.class));
+        return object;
+    }
+
+    @Override
+    public Object[] objectToField(ClearingCalendar object) {
+        Object[] args = new Object[]{
+                object.getId(),
+                TimeUtil.toDateFromInstant(object.getCreated()),
+                TimeUtil.toDateFromInstant(object.getUpdated()),
+                TimeUtil.toDateFromLocalDate(object.getClearingDate()),
+                object.getCompanyId(),
+                object.getTradingStatus()
+        };
+        return args;
+    }
+
 }
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TaskRunnerMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/LauncherMapStore.java
similarity index 73%
rename from clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TaskRunnerMapStore.java
rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/LauncherMapStore.java
index e9d0452e8..c927bada4 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TaskRunnerMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/LauncherMapStore.java
@@ -1,60 +1,60 @@
-package ru.spcex.clearing.imdg.businessobject;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-import ru.clearing.classes.statics.data.scheduler.TaskRunner;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.imdg.base.TemplateMapStore;
-import ru.spcex.platform.utils.time.TimeUtil;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-@Component
-public class TaskRunnerMapStore extends TemplateMapStore<TaskRunner> {
-
-    public TaskRunnerMapStore(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate);
-    }
-
-    @Override
-    public String getMapName() {
-        return IMDGDistributedNames.Map_TaskRunner;
-    }
-
-    @Override
-    public String getTableName() {
-        return "TASK_RUNNER";
-    }
-
-    @Override
-    public String[] getFields() {
-        return new String[]{
-                "ID",  "CREATED_AT",  "UPDATED_AT",  "SENDER_ID",  "TASK"
-        };
-    }
-
-    @Override
-    public TaskRunner objectReader(ResultSet resultSet) throws SQLException {
-        TaskRunner object = new TaskRunner();
-        object.setId(resultSet.getObject("ID", Long.class));
-        object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
-        object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
-        object.setSenderId(resultSet.getObject("SENDER_ID", Long.class));
-        object.setTask(resultSet.getObject("TASK", String.class));
-        return object;
-    }
-
-    @Override
-    public Object[] objectToField(TaskRunner object) {
-        Object[] args = new Object[]{
-                object.getId(),
-                TimeUtil.toDateFromInstant(object.getCreated()),
-                TimeUtil.toDateFromInstant(object.getUpdated()),
-                object.getSenderId(),
-                object.getTask()
-        };
-        return args;
-    }
-
+package ru.spcex.clearing.imdg.businessobject;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.classes.statics.data.scheduler.Launcher;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.imdg.base.TemplateMapStore;
+import ru.spcex.platform.utils.time.TimeUtil;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+@Component
+public class LauncherMapStore extends TemplateMapStore<Launcher> {
+
+    public LauncherMapStore(JdbcTemplate jdbcTemplate) {
+        super(jdbcTemplate);
+    }
+
+    @Override
+    public String getMapName() {
+        return IMDGDistributedNames.Map_Launcher;
+    }
+
+    @Override
+    public String getTableName() {
+        return "LAUNCHER";
+    }
+
+    @Override
+    public String[] getFields() {
+        return new String[]{
+                "ID",  "CREATED_AT",  "UPDATED_AT",  "SENDER_ID",  "TASK"
+        };
+    }
+
+    @Override
+    public Launcher objectReader(ResultSet resultSet) throws SQLException {
+        Launcher object = new Launcher();
+        object.setId(resultSet.getObject("ID", Long.class));
+        object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
+        object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
+        object.setSenderId(resultSet.getObject("SENDER_ID", Long.class));
+        object.setTask(resultSet.getObject("TASK", String.class));
+        return object;
+    }
+
+    @Override
+    public Object[] objectToField(Launcher object) {
+        Object[] args = new Object[]{
+                object.getId(),
+                TimeUtil.toDateFromInstant(object.getCreated()),
+                TimeUtil.toDateFromInstant(object.getUpdated()),
+                object.getSenderId(),
+                object.getTask()
+        };
+        return args;
+    }
+
 }
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/SchedulerMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerMapStore.java
similarity index 79%
rename from clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/SchedulerMapStore.java
rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerMapStore.java
index a5ed34203..1de186ecd 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/SchedulerMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerMapStore.java
@@ -1,68 +1,68 @@
-package ru.spcex.clearing.imdg.businessobject;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-import ru.clearing.classes.statics.data.scheduler.Scheduler;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.imdg.base.TemplateMapStore;
-import ru.spcex.platform.utils.time.TimeUtil;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-@Component
-public class SchedulerMapStore extends TemplateMapStore<Scheduler> {
-
-    public SchedulerMapStore(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate);
-    }
-
-    @Override
-    public String getMapName() {
-        return IMDGDistributedNames.Map_Scheduler;
-    }
-
-    @Override
-    public String getTableName() {
-        return "SCHEDULER";
-    }
-
-    @Override
-    public String[] getFields() {
-        return new String[]{
-                "ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "SECURITY_ID"
-        };
-    }
-
-    @Override
-    public Scheduler objectReader(ResultSet resultSet) throws SQLException {
-        Scheduler object = new Scheduler();
-        object.setId(resultSet.getObject("ID", Long.class));
-        object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
-        object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
-        object.setTask(resultSet.getObject("TASK", String.class));
-        object.setTaskTime(getLocalTimeFromSqlTime(resultSet, "TASK_TIME"));
-        object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
-        object.setMarket(resultSet.getObject("MARKET", String.class));
-        object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
-        object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
-        return object;
-    }
-
-    @Override
-    public Object[] objectToField(Scheduler object) {
-        Object[] args = new Object[]{
-                object.getId(),
-                TimeUtil.toDateFromInstant(object.getCreated()),
-                TimeUtil.toDateFromInstant(object.getUpdated()),
-                object.getTask(),
-                TimeUtil.toDateFromLocalTime(object.getTaskTime()),
-                TimeUtil.toDateFromLocalDate(object.getClearingDate()),
-                object.getMarket(),
-                object.getTaskStatus(),
-                object.getSecurityId()
-        };
-        return args;
-    }
-
+package ru.spcex.clearing.imdg.businessobject;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.classes.statics.data.scheduler.Planner;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.imdg.base.TemplateMapStore;
+import ru.spcex.platform.utils.time.TimeUtil;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+@Component
+public class PlannerMapStore extends TemplateMapStore<Planner> {
+
+    public PlannerMapStore(JdbcTemplate jdbcTemplate) {
+        super(jdbcTemplate);
+    }
+
+    @Override
+    public String getMapName() {
+        return IMDGDistributedNames.Map_Planner;
+    }
+
+    @Override
+    public String getTableName() {
+        return "PLANNER";
+    }
+
+    @Override
+    public String[] getFields() {
+        return new String[]{
+                "ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "SECURITY_ID"
+        };
+    }
+
+    @Override
+    public Planner objectReader(ResultSet resultSet) throws SQLException {
+        Planner object = new Planner();
+        object.setId(resultSet.getObject("ID", Long.class));
+        object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
+        object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
+        object.setTask(resultSet.getObject("TASK", String.class));
+        object.setTaskTime(getLocalTimeFromSqlTime(resultSet, "TASK_TIME"));
+        object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
+        object.setMarket(resultSet.getObject("MARKET", String.class));
+        object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
+        object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
+        return object;
+    }
+
+    @Override
+    public Object[] objectToField(Planner object) {
+        Object[] args = new Object[]{
+                object.getId(),
+                TimeUtil.toDateFromInstant(object.getCreated()),
+                TimeUtil.toDateFromInstant(object.getUpdated()),
+                object.getTask(),
+                TimeUtil.toDateFromLocalTime(object.getTaskTime()),
+                TimeUtil.toDateFromLocalDate(object.getClearingDate()),
+                object.getMarket(),
+                object.getTaskStatus(),
+                object.getSecurityId()
+        };
+        return args;
+    }
+
 }
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TimetableMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerTemplateMapStore.java
similarity index 75%
rename from clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TimetableMapStore.java
rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerTemplateMapStore.java
index a4d78c085..b1b1c8c29 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/TimetableMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/PlannerTemplateMapStore.java
@@ -1,62 +1,62 @@
-package ru.spcex.clearing.imdg.businessobject;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-import ru.clearing.classes.statics.data.scheduler.Timetable;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.imdg.base.TemplateMapStore;
-import ru.spcex.platform.utils.time.TimeUtil;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-@Component
-public class TimetableMapStore extends TemplateMapStore<Timetable> {
-
-    public TimetableMapStore(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate);
-    }
-
-    @Override
-    public String getMapName() {
-        return IMDGDistributedNames.Map_Timetable;
-    }
-
-    @Override
-    public String getTableName() {
-        return "TIMETABLE";
-    }
-
-    @Override
-    public String[] getFields() {
-        return new String[]{
-                "ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "TASK_STATUS"
-        };
-    }
-
-    @Override
-    public Timetable objectReader(ResultSet resultSet) throws SQLException {
-        Timetable object = new Timetable();
-        object.setId(resultSet.getObject("ID", Long.class));
-        object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
-        object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
-        object.setTask(resultSet.getObject("TASK", String.class));
-        object.setTaskTime(getLocalTimeFromSqlTime(resultSet, "TASK_TIME"));
-        object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
-        return object;
-    }
-
-    @Override
-    public Object[] objectToField(Timetable object) {
-        Object[] args = new Object[]{
-                object.getId(),
-                TimeUtil.toDateFromInstant(object.getCreated()),
-                TimeUtil.toDateFromInstant(object.getUpdated()),
-                object.getTask(),
-                TimeUtil.toDateFromLocalTime(object.getTaskTime()),
-                object.getTaskStatus()
-        };
-        return args;
-    }
-
+package ru.spcex.clearing.imdg.businessobject;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.classes.statics.data.scheduler.PlannerTemplate;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.imdg.base.TemplateMapStore;
+import ru.spcex.platform.utils.time.TimeUtil;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+@Component
+public class PlannerTemplateMapStore extends TemplateMapStore<PlannerTemplate> {
+
+    public PlannerTemplateMapStore(JdbcTemplate jdbcTemplate) {
+        super(jdbcTemplate);
+    }
+
+    @Override
+    public String getMapName() {
+        return IMDGDistributedNames.Map_PlannerTemplate;
+    }
+
+    @Override
+    public String getTableName() {
+        return "PLANNER_TEMPLATE";
+    }
+
+    @Override
+    public String[] getFields() {
+        return new String[]{
+                "ID", "CREATED_AT", "UPDATED_AT", "TASK", "TASK_TIME", "TASK_STATUS"
+        };
+    }
+
+    @Override
+    public PlannerTemplate objectReader(ResultSet resultSet) throws SQLException {
+        PlannerTemplate object = new PlannerTemplate();
+        object.setId(resultSet.getObject("ID", Long.class));
+        object.setCreated(getInstantFromTimestamp(resultSet, "CREATED_AT"));
+        object.setUpdated(getInstantFromTimestamp(resultSet, "UPDATED_AT"));
+        object.setTask(resultSet.getObject("TASK", String.class));
+        object.setTaskTime(getLocalTimeFromSqlTime(resultSet, "TASK_TIME"));
+        object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
+        return object;
+    }
+
+    @Override
+    public Object[] objectToField(PlannerTemplate object) {
+        Object[] args = new Object[]{
+                object.getId(),
+                TimeUtil.toDateFromInstant(object.getCreated()),
+                TimeUtil.toDateFromInstant(object.getUpdated()),
+                object.getTask(),
+                TimeUtil.toDateFromLocalTime(object.getTaskTime()),
+                object.getTaskStatus()
+        };
+        return args;
+    }
+
 }
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/DayStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/DayStatusDictionaryMapStore.java
new file mode 100644
index 000000000..dc79826e4
--- /dev/null
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/DayStatusDictionaryMapStore.java
@@ -0,0 +1,31 @@
+package ru.spcex.clearing.imdg.dictionary;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.platform.dictionary.DayStatusDictionary;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+
+@Component
+public class DayStatusDictionaryMapStore extends DictionaryTMapStore<DayStatusDictionary> {
+
+    public DayStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+        super(jdbcTemplate);
+    }
+
+    @Override
+    public String getMapName() {
+        return IMDGDistributedNames.Map_DayStatusDictionary;
+    }
+
+    @Override
+    public String getTableName() {
+        return "DAY_STATUS_DICTIONARY";
+    }
+
+    @Override
+    public DayStatusDictionary getDictionaryObject() {
+        return new DayStatusDictionary();
+    }
+
+}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SourceDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ParentDictionaryMapStore.java
similarity index 50%
rename from clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SourceDictionaryMapStore.java
rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ParentDictionaryMapStore.java
index 6ea7f468b..75b9dc38a 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/SourceDictionaryMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/ParentDictionaryMapStore.java
@@ -1,31 +1,31 @@
-package ru.spcex.clearing.imdg.dictionary;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-import ru.clearing.platform.dictionary.SourceDictionary;
-import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-
-@Component
-public class SourceDictionaryMapStore extends DictionaryTMapStore<SourceDictionary> {
-
-    public SourceDictionaryMapStore(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate);
-    }
-
-    @Override
-    public String getMapName() {
-        return IMDGDistributedNames.Map_SourceDictionary;
-    }
-
-    @Override
-    public String getTableName() {
-        return "SOURCE_DICTIONARY";
-    }
-
-    @Override
-    public SourceDictionary getDictionaryObject() {
-        return new SourceDictionary();
-    }
-
-}
+package ru.spcex.clearing.imdg.dictionary;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.platform.dictionary.ParentDictionary;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
+
+@Component
+public class ParentDictionaryMapStore extends DictionaryTMapStore<ParentDictionary> {
+
+    public ParentDictionaryMapStore(JdbcTemplate jdbcTemplate) {
+        super(jdbcTemplate);
+    }
+
+    @Override
+    public String getMapName() {
+        return IMDGDistributedNames.Map_ParentDictionary;
+    }
+
+    @Override
+    public String getTableName() {
+        return "PARENT_DICTIONARY";
+    }
+
+    @Override
+    public ParentDictionary getDictionaryObject() {
+        return new ParentDictionary();
+    }
+
+}
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TradingStatusDictionaryMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TradingStatusDictionaryMapStore.java
deleted file mode 100644
index 6ed62f8ab..000000000
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/dictionary/TradingStatusDictionaryMapStore.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package ru.spcex.clearing.imdg.dictionary;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-import ru.clearing.platform.dictionary.TradingStatusDictionary;
-import ru.spcex.clearing.imdg.base.DictionaryTMapStore;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-
-@Component
-public class TradingStatusDictionaryMapStore extends DictionaryTMapStore<TradingStatusDictionary> {
-
-    public TradingStatusDictionaryMapStore(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate);
-    }
-
-    @Override
-    public String getMapName() {
-        return IMDGDistributedNames.Map_TradingStatusDictionary;
-    }
-
-    @Override
-    public String getTableName() {
-        return "TRADING_STATUS_DICTIONARY";
-    }
-
-    @Override
-    public TradingStatusDictionary getDictionaryObject() {
-        return new TradingStatusDictionary();
-    }
-
-}
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PaymentInstructionMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PaymentInstructionMapStore.java
index 4ed666042..fa42fdb6d 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PaymentInstructionMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PaymentInstructionMapStore.java
@@ -44,7 +44,7 @@ public class PaymentInstructionMapStore extends TemplateMapStore<PaymentInstruct
         paymentInstruction.setPayeeBIC(resultSet.getString("payee_b_i_c"));
         paymentInstruction.setAddresseeBankName(resultSet.getString("addressee_bank_name"));
         paymentInstruction.setPaymentDate(getInstantFromTimestamp(resultSet, "payment_date"));
-        paymentInstruction.setPaymentPurpose(resultSet.getString("_payment_purpose"));
+        paymentInstruction.setPaymentPurpose(resultSet.getString("payment_purpose"));
         paymentInstruction.setSettlementDate(getLocalDateFromSqlDate(resultSet, "settlement_date"));
         paymentInstruction.setCreditLegAmount(resultSet.getLong("credit_leg_amount"));
         paymentInstruction.setDebitLegAmount(resultSet.getLong("debit_leg_amount"));
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SchedulerAllTodayMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PlannerAllTodayMapStore.java
similarity index 76%
rename from clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SchedulerAllTodayMapStore.java
rename to clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PlannerAllTodayMapStore.java
index b72be8e6f..acd395527 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/SchedulerAllTodayMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/PlannerAllTodayMapStore.java
@@ -1,68 +1,68 @@
-package ru.spcex.clearing.imdg.object;
-
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Component;
-import ru.clearing.classes.statics.data.scheduler.SchedulerAllToday;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.imdg.base.TemplateMapStore;
-import ru.spcex.platform.utils.time.TimeUtil;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-@Component
-public class SchedulerAllTodayMapStore extends TemplateMapStore<SchedulerAllToday> {
-
-    public SchedulerAllTodayMapStore(JdbcTemplate jdbcTemplate) {
-        super(jdbcTemplate);
-    }
-
-    @Override
-    public String getMapName() {
-        return IMDGDistributedNames.Map_SchedulerAllToday;
-    }
-
-    @Override
-    public String getTableName() {
-        return "SCHEDULER_ALL_TODAY";
-    }
-
-    @Override
-    public String[] getFields() {
-        return new String[]{
-                "ID", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "SECURITY_ID", "SOURCE", "ORIG_ID"
-        };
-    }
-
-    @Override
-    public SchedulerAllToday objectReader(ResultSet resultSet) throws SQLException {
-        SchedulerAllToday object = new SchedulerAllToday();
-        object.setId(resultSet.getObject("ID", Long.class));
-        object.setTask(resultSet.getObject("TASK", String.class));
-        object.setTaskTime(getLocalTimeFromSqlTime(resultSet, "TASK_TIME"));
-        object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
-        object.setMarket(resultSet.getObject("MARKET", String.class));
-        object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
-        object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
-        object.setSource(resultSet.getObject("SOURCE", String.class));
-        object.setOrigId(resultSet.getObject("ORIG_ID", Long.class));
-        return object;
-    }
-
-    @Override
-    public Object[] objectToField(SchedulerAllToday object) {
-        Object[] args = new Object[]{
-                object.getId(),
-                object.getTask(),
-                TimeUtil.toDateFromLocalTime(object.getTaskTime()),
-                TimeUtil.toDateFromLocalDate(object.getClearingDate()),
-                object.getMarket(),
-                object.getTaskStatus(),
-                object.getSecurityId(),
-                object.getSource(),
-                object.getOrigId()
-        };
-        return args;
-    }
-
+package ru.spcex.clearing.imdg.object;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Component;
+import ru.clearing.classes.statics.data.scheduler.PlannerAllToday;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.imdg.base.TemplateMapStore;
+import ru.spcex.platform.utils.time.TimeUtil;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+@Component
+public class PlannerAllTodayMapStore extends TemplateMapStore<PlannerAllToday> {
+
+    public PlannerAllTodayMapStore(JdbcTemplate jdbcTemplate) {
+        super(jdbcTemplate);
+    }
+
+    @Override
+    public String getMapName() {
+        return IMDGDistributedNames.Map_PlannerAllToday;
+    }
+
+    @Override
+    public String getTableName() {
+        return "PLANNER_ALL_TODAY";
+    }
+
+    @Override
+    public String[] getFields() {
+        return new String[]{
+                "ID", "TASK", "TASK_TIME", "CLEARING_DATE", "MARKET", "TASK_STATUS", "SECURITY_ID", "SOURCE", "ORIG_ID"
+        };
+    }
+
+    @Override
+    public PlannerAllToday objectReader(ResultSet resultSet) throws SQLException {
+        PlannerAllToday object = new PlannerAllToday();
+        object.setId(resultSet.getObject("ID", Long.class));
+        object.setTask(resultSet.getObject("TASK", String.class));
+        object.setTaskTime(getLocalTimeFromSqlTime(resultSet, "TASK_TIME"));
+        object.setClearingDate(getLocalDateFromSqlDate(resultSet, "CLEARING_DATE"));
+        object.setMarket(resultSet.getObject("MARKET", String.class));
+        object.setTaskStatus(resultSet.getObject("TASK_STATUS", String.class));
+        object.setSecurityId(resultSet.getObject("SECURITY_ID", Long.class));
+        object.setSource(resultSet.getObject("SOURCE", String.class));
+        object.setOrigId(resultSet.getObject("ORIG_ID", Long.class));
+        return object;
+    }
+
+    @Override
+    public Object[] objectToField(PlannerAllToday object) {
+        Object[] args = new Object[]{
+                object.getId(),
+                object.getTask(),
+                TimeUtil.toDateFromLocalTime(object.getTaskTime()),
+                TimeUtil.toDateFromLocalDate(object.getClearingDate()),
+                object.getMarket(),
+                object.getTaskStatus(),
+                object.getSecurityId(),
+                object.getSource(),
+                object.getOrigId()
+        };
+        return args;
+    }
+
 }
\ No newline at end of file
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java
index 432c51755..83d356bdc 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java
@@ -2,9 +2,9 @@ package ru.spcex.clearing.imdg.util;
 
 import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IMap;
-import ru.clearing.classes.statics.data.scheduler.Scheduler;
-import ru.clearing.classes.statics.data.scheduler.Timetable;
-import ru.clearing.classes.statics.data.scheduler.TradingCalendar;
+import ru.clearing.classes.statics.data.scheduler.ClearingCalendar;
+import ru.clearing.classes.statics.data.scheduler.Planner;
+import ru.clearing.classes.statics.data.scheduler.PlannerTemplate;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -14,12 +14,12 @@ import static ru.spcex.clearing.imdg.IMDGDistributedNames.*;
 public class Util {
 
     public static void makeSchedulerAllTodayMap(HazelcastInstance hazelcastInstance) {
-        IMap<Long, Scheduler> schedulerMap = hazelcastInstance.getMap(Map_Scheduler);
-        IMap<Long, TradingCalendar> tradingCalendarMap = hazelcastInstance.getMap(Map_TradingCalendar);
-        IMap<Long, Timetable> timetableMap = hazelcastInstance.getMap(Map_Timetable);
+        IMap<Long, Planner> plannerMap = hazelcastInstance.getMap(Map_Planner);
+        IMap<Long, ClearingCalendar> tradingCalendarMap = hazelcastInstance.getMap(Map_ClearingCalendar);
+        IMap<Long, PlannerTemplate> plannerTemplateMap = hazelcastInstance.getMap(Map_PlannerTemplate);
         Boolean isTradingCalendarEmpty = tradingCalendarMap.isEmpty();
 
-        List<Scheduler> listOfSchedulerOnDate = schedulerMap.values().stream().filter((x) -> x.getClearingDate().isEqual(LocalDate.now())).toList();
+        List<Planner> listOfSchedulerOnDate = plannerMap.values().stream().filter((x) -> x.getClearingDate().isEqual(LocalDate.now())).toList();
         if (isTradingCalendarEmpty) {
             //то из timeTable все активные записи.
         } else {
diff --git a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java
index 153812e43..f97406af2 100644
--- a/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java
+++ b/clearing-parent/imdg/src/test/java/ru/spcex/clearing/imdg/structure/RunnableMapNamesForTesting.java
@@ -59,13 +59,13 @@ public class RunnableMapNamesForTesting {
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_Company, Company.class));
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_ErrorText, ErrorText.class));
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_Relation, Relation.class));
-        businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_Scheduler, Scheduler.class));
+        businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_Planner, Planner.class));
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_Security, Security.class));
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_Statement, Statement.class,
                 new SettingOperation("setAmount", new Class[]{BigDecimal.class}, new Object[]{new BigDecimal("23.22")})));
-        businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_TaskRunner, TaskRunner.class));
-        businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_Timetable, Timetable.class));
-        businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_TradingCalendar, TradingCalendar.class));
+        businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_Launcher, Launcher.class));
+        businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_PlannerTemplate, PlannerTemplate.class));
+        businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_ClearingCalendar, ClearingCalendar.class));
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_UserConnect, UserConnect.class));
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_User, User.class));
 
@@ -102,12 +102,12 @@ public class RunnableMapNamesForTesting {
         dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_ServiceDictionary, ServiceDictionary.class));
         dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_ServiceProductDictionary, ServiceProductDictionary.class));
         dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_ServiceStatusDictionary, ServiceStatusDictionary.class));
-        dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_SourceDictionary, SourceDictionary.class));
+        dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_ParentDictionary, ParentDictionary.class));
         dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_StatementTypeDictionary, StatementTypeDictionary.class));
         dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_TaskDictionary, TaskDictionary.class));
         dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_TaskStatusDictionary, TaskStatusDictionary.class));
         dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_TermTypeDictionary, TermTypeDictionary.class));
-        dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_TradingStatusDictionary, TradingStatusDictionary.class));
+        dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_DayStatusDictionary, DayStatusDictionary.class));
         dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_UserRoleDictionary, UserRoleDictionary.class));
         dictionaryObjectForCheckMapStores.add(new DictionaryObjectForCheckMapStore<>(IMDGDistributedNames.Map_WorkflowStatusDictionary, WorkflowStatusDictionary.class));
 
@@ -127,7 +127,7 @@ public class RunnableMapNamesForTesting {
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_OutDocumentJournal, OutDocumentJournal.class,
                 new SettingOperation("setAmount", new Class[]{BigDecimal.class}, new Object[]{new BigDecimal("23.22")})));
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_ProfileDocument, ProfileDocument.class));
-        businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SchedulerAllToday, SchedulerAllToday.class));
+        businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_PlannerAllToday, PlannerAllToday.class));
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf01, SDf01.class));
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf02, SDf02.class));
         businessObjectAndBusinessEventForCheckMapStores.add(new BusinessObjectAndBusinessEventForCheckMapStore<>(IMDGDistributedNames.Map_SDf03, SDf03.class));
diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java
new file mode 100644
index 000000000..619368bcf
--- /dev/null
+++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/ClearingCalendarService.java
@@ -0,0 +1,75 @@
+package ru.spcex.clearing.scheduler.service;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.producer.Producer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import ru.clearing.classes.statics.data.scheduler.ClearingCalendar;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
+import ru.spcex.clearing.platform.messaging.domain.Consts;
+import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.schedule.ClearingCalendarNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.schedule.ClearingCalendarUpdateRequest;
+import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+@Service
+public class ClearingCalendarService extends QueueConsumer implements InitializingBean {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final Imdg<ClearingCalendar> clearingCalendarMap;
+
+    @Autowired
+    public ClearingCalendarService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
+                                   ImdgProvider imdgProvider) {
+        super(kafkaQueue, kafkaProducer);
+        this.clearingCalendarMap = imdgProvider.getImdg(IMDGDistributedNames.Map_ClearingCalendar, ClearingCalendar.class);
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        callback(ClearingCalendarNewRequest.class)
+                .setConsumer(this::newTradingCalendar)
+                .forDestination(Consts.DESTINATION_CLEARING_CALENDAR_NEW, callbacks::put);
+        callback(ClearingCalendarUpdateRequest.class)
+                .setConsumer(this::updateTradingCalendar)
+                .forDestination(Consts.DESTINATION_CLEARING_CALENDAR_UPDATE, callbacks::put);
+        callback(CommonDeleteRequest.class)
+                .setConsumer(this::deleteTradingCalendar)
+                .forDestination(Consts.DESTINATION_CLEARING_CALENDAR_DELETE, callbacks::put);
+        init();
+    }
+
+    private void newTradingCalendar(BaseRequest<ClearingCalendarNewRequest> userRequest) {
+        ClearingCalendarNewRequest req = userRequest.getRequestPayload();
+        log.debug("ClearingCalendarNewRequest received");
+        ClearingCalendar clearingCalendar = new ClearingCalendar();
+        clearingCalendar.setClearingDate(req.getClearingDate());
+        clearingCalendar.setCompanyId(req.getCompanyId());
+        clearingCalendar.setTradingStatus(req.getTradingStatus());
+        clearingCalendarMap.insert(clearingCalendar);
+        log.debug("successfully processed, new id {}", clearingCalendar.getId());
+    }
+
+    private void updateTradingCalendar(BaseRequest<ClearingCalendarUpdateRequest> userRequest) {
+        ClearingCalendarUpdateRequest req = userRequest.getRequestPayload();
+        log.debug("ClearingCalendarUpdateRequest received");
+        ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId());
+        clearingCalendar.setClearingDate(req.getClearingDate());
+        clearingCalendar.setCompanyId(req.getCompanyId());
+        clearingCalendar.setTradingStatus(req.getTradingStatus());
+        clearingCalendarMap.update(clearingCalendar);
+        log.debug("successfully processed, new id {}", clearingCalendar.getId());
+    }
+
+    private void deleteTradingCalendar(BaseRequest<CommonDeleteRequest> userRequest) {
+        CommonDeleteRequest req = userRequest.getRequestPayload();
+        log.debug("CommonDeleteRequest received id = {}", req.getId());
+        ClearingCalendar clearingCalendar = clearingCalendarMap.getSingleObjectByID(req.getId());
+        clearingCalendarMap.delete(clearingCalendar);
+    }
+}
diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerAllTodayService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerAllTodayService.java
similarity index 65%
rename from clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerAllTodayService.java
rename to clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerAllTodayService.java
index 959c40453..88515a082 100644
--- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerAllTodayService.java
+++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerAllTodayService.java
@@ -7,22 +7,22 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import ru.clearing.classes.statics.data.scheduler.SchedulerAllToday;
+import ru.clearing.classes.statics.data.scheduler.PlannerAllToday;
 import ru.spcex.clearing.imdg.IMDGDistributedNames;
 import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
 import ru.spcex.platform.imdg.api.Imdg;
 import ru.spcex.platform.imdg.api.ImdgProvider;
 
 @Service
-public class SchedulerAllTodayService extends QueueConsumer implements InitializingBean {
+public class PlannerAllTodayService extends QueueConsumer implements InitializingBean {
     private final Logger log = LoggerFactory.getLogger(getClass());
-    private final Imdg<SchedulerAllToday> schedulerAllTodayMap;
+    private final Imdg<PlannerAllToday> schedulerAllTodayMap;
 
     @Autowired
-    public SchedulerAllTodayService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
-                                    ImdgProvider imdgProvider) {
+    public PlannerAllTodayService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
+                                  ImdgProvider imdgProvider) {
         super(kafkaQueue, kafkaProducer);
-        this.schedulerAllTodayMap = imdgProvider.getImdg(IMDGDistributedNames.Map_SchedulerAllToday, SchedulerAllToday.class);
+        this.schedulerAllTodayMap = imdgProvider.getImdg(IMDGDistributedNames.Map_PlannerAllToday, PlannerAllToday.class);
     }
 
     @Override
diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java
new file mode 100644
index 000000000..dcef9b26e
--- /dev/null
+++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerService.java
@@ -0,0 +1,81 @@
+package ru.spcex.clearing.scheduler.service;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.producer.Producer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import ru.clearing.classes.statics.data.scheduler.Planner;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
+import ru.spcex.clearing.platform.messaging.domain.Consts;
+import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerUpdateRequest;
+import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+@Service
+public class PlannerService extends QueueConsumer implements InitializingBean {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final Imdg<Planner> plannerMap;
+
+    @Autowired
+    public PlannerService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
+                          ImdgProvider imdgProvider) {
+        super(kafkaQueue, kafkaProducer);
+        this.plannerMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Planner, Planner.class);
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        callback(PlannerNewRequest.class)
+                .setConsumer(this::newScheduler)
+                .forDestination(Consts.DESTINATION_PLANNER_NEW, callbacks::put);
+        callback(PlannerUpdateRequest.class)
+                .setConsumer(this::updateScheduler)
+                .forDestination(Consts.DESTINATION_PLANNER_UPDATE, callbacks::put);
+        callback(CommonDeleteRequest.class)
+                .setConsumer(this::deleteScheduler)
+                .forDestination(Consts.DESTINATION_PLANNER_DELETE, callbacks::put);
+        init();
+    }
+
+    private void newScheduler(BaseRequest<PlannerNewRequest> userRequest) {
+        PlannerNewRequest req = userRequest.getRequestPayload();
+        log.debug("PlannerNewRequest received");
+        Planner planner = new Planner();
+        planner.setTask(req.getTask());
+        planner.setTaskTime(req.getTaskTime());
+        planner.setClearingDate(req.getClearingDate());
+        planner.setMarket(req.getMarket());
+        planner.setTaskStatus(req.getTaskStatus());
+        planner.setSecurityId(req.getSecurityId());
+        plannerMap.insert(planner);
+        log.debug("successfully processed, new id {}", planner.getId());
+    }
+
+    private void updateScheduler(BaseRequest<PlannerUpdateRequest> userRequest) {
+        PlannerUpdateRequest req = userRequest.getRequestPayload();
+        log.debug("PlannerUpdateRequest received id = {}", req.getId());
+        Planner planner = plannerMap.getSingleObjectByID(req.getId());
+        planner.setTask(req.getTask());
+        planner.setTaskTime(req.getTaskTime());
+        planner.setClearingDate(req.getClearingDate());
+        planner.setMarket(req.getMarket());
+        planner.setTaskStatus(req.getTaskStatus());
+        planner.setSecurityId(req.getSecurityId());
+        plannerMap.update(planner);
+    }
+
+    private void deleteScheduler(BaseRequest<CommonDeleteRequest> userRequest) {
+        CommonDeleteRequest req = userRequest.getRequestPayload();
+        log.debug("CommonDeleteRequest received id = {}", req.getId());
+        Planner planner = plannerMap.getSingleObjectByID(req.getId());
+        plannerMap.delete(planner);
+    }
+
+}
diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java
new file mode 100644
index 000000000..0fceaa2d4
--- /dev/null
+++ b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/PlannerTemplateService.java
@@ -0,0 +1,75 @@
+package ru.spcex.clearing.scheduler.service;
+
+import org.apache.kafka.clients.consumer.Consumer;
+import org.apache.kafka.clients.producer.Producer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import ru.clearing.classes.statics.data.scheduler.PlannerTemplate;
+import ru.spcex.clearing.imdg.IMDGDistributedNames;
+import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
+import ru.spcex.clearing.platform.messaging.domain.Consts;
+import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerTemplateNewRequest;
+import ru.spcex.clearing.platform.messaging.domain.cud.schedule.PlannerTemplateUpdateRequest;
+import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
+import ru.spcex.platform.imdg.api.Imdg;
+import ru.spcex.platform.imdg.api.ImdgProvider;
+
+@Service
+public class PlannerTemplateService extends QueueConsumer implements InitializingBean {
+    private final Logger log = LoggerFactory.getLogger(getClass());
+    private final Imdg<PlannerTemplate> plannerTemplateMap;
+
+    @Autowired
+    public PlannerTemplateService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
+                                  ImdgProvider imdgProvider) {
+        super(kafkaQueue, kafkaProducer);
+        this.plannerTemplateMap = imdgProvider.getImdg(IMDGDistributedNames.Map_PlannerTemplate, PlannerTemplate.class);
+    }
+
+    @Override
+    public void afterPropertiesSet() {
+        callback(PlannerTemplateNewRequest.class)
+                .setConsumer(this::newTimetable)
+                .forDestination(Consts.DESTINATION_PLANNER_TEMPLATE_NEW, callbacks::put);
+        callback(PlannerTemplateUpdateRequest.class)
+                .setConsumer(this::updateTimetable)
+                .forDestination(Consts.DESTINATION_PLANNER_TEMPLATE_UPDATE, callbacks::put);
+        callback(CommonDeleteRequest.class)
+                .setConsumer(this::deleteTimetable)
+                .forDestination(Consts.DESTINATION_PLANNER_TEMPLATE_DELETE, callbacks::put);
+        init();
+    }
+
+    private void newTimetable(BaseRequest<PlannerTemplateNewRequest> userRequest) {
+        PlannerTemplateNewRequest req = userRequest.getRequestPayload();
+        log.debug("PlannerTemplateNewRequest received");
+        PlannerTemplate plannerTemplate = new PlannerTemplate();
+        plannerTemplate.setTask(req.getTask());
+        plannerTemplate.setTaskTime(req.getTaskTime());
+        plannerTemplate.setTaskStatus(req.getTaskStatus());
+        plannerTemplateMap.insert(plannerTemplate);
+        log.debug("successfully processed, new id {}", plannerTemplate.getId());
+    }
+
+    private void updateTimetable(BaseRequest<PlannerTemplateUpdateRequest> userRequest) {
+        PlannerTemplateUpdateRequest req = userRequest.getRequestPayload();
+        log.debug("PlannerTemplateUpdateRequest received");
+        PlannerTemplate plannerTemplate = plannerTemplateMap.getSingleObjectByID(req.getId());
+        plannerTemplate.setTask(req.getTask());
+        plannerTemplate.setTaskTime(req.getTaskTime());
+        plannerTemplate.setTaskStatus(req.getTaskStatus());
+        plannerTemplateMap.update(plannerTemplate);
+        log.debug("successfully processed, new id {}", plannerTemplate.getId());
+    }
+
+    private void deleteTimetable(BaseRequest<CommonDeleteRequest> userRequest) {
+        CommonDeleteRequest req = userRequest.getRequestPayload();
+        log.debug("CommonDeleteRequest received id = {}", req.getId());
+        PlannerTemplate plannerTemplate = plannerTemplateMap.getSingleObjectByID(req.getId());
+        plannerTemplateMap.delete(plannerTemplate);
+    }
+}
diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerService.java
deleted file mode 100644
index b07db3270..000000000
--- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/SchedulerService.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package ru.spcex.clearing.scheduler.service;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.producer.Producer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import ru.clearing.classes.statics.data.scheduler.Scheduler;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.schedule.SchedulerNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.schedule.SchedulerUpdateRequest;
-import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-
-@Service
-public class SchedulerService extends QueueConsumer implements InitializingBean {
-    private final Logger log = LoggerFactory.getLogger(getClass());
-    private final Imdg<Scheduler> schedulerMap;
-
-    @Autowired
-    public SchedulerService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
-                            ImdgProvider imdgProvider) {
-        super(kafkaQueue, kafkaProducer);
-        this.schedulerMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Scheduler, Scheduler.class);
-    }
-
-    @Override
-    public void afterPropertiesSet() {
-        callback(SchedulerNewRequest.class)
-                .setConsumer(this::newScheduler)
-                .forDestination(Consts.DESTINATION_SCHEDULER_NEW, callbacks::put);
-        callback(SchedulerUpdateRequest.class)
-                .setConsumer(this::updateScheduler)
-                .forDestination(Consts.DESTINATION_SCHEDULER_UPDATE, callbacks::put);
-        callback(CommonDeleteRequest.class)
-                .setConsumer(this::deleteScheduler)
-                .forDestination(Consts.DESTINATION_SCHEDULER_DELETE, callbacks::put);
-        init();
-    }
-
-    private void newScheduler(BaseRequest<SchedulerNewRequest> userRequest) {
-        SchedulerNewRequest req = userRequest.getRequestPayload();
-        log.debug("SchedulerNewRequest received");
-        Scheduler scheduler = new Scheduler();
-        scheduler.setTask(req.getTask());
-        scheduler.setTaskTime(req.getTaskTime());
-        scheduler.setClearingDate(req.getClearingDate());
-        scheduler.setMarket(req.getMarket());
-        scheduler.setTaskStatus(req.getTaskStatus());
-        scheduler.setSecurityId(req.getSecurityId());
-        schedulerMap.insert(scheduler);
-        log.debug("successfully processed, new id {}", scheduler.getId());
-    }
-
-    private void updateScheduler(BaseRequest<SchedulerUpdateRequest> userRequest) {
-        SchedulerUpdateRequest req = userRequest.getRequestPayload();
-        log.debug("MoneyMarketSecurityUpdateRequest received id = {}", req.getId());
-        Scheduler scheduler = schedulerMap.getSingleObjectByID(req.getId());
-        scheduler.setTask(req.getTask());
-        scheduler.setTaskTime(req.getTaskTime());
-        scheduler.setClearingDate(req.getClearingDate());
-        scheduler.setMarket(req.getMarket());
-        scheduler.setTaskStatus(req.getTaskStatus());
-        scheduler.setSecurityId(req.getSecurityId());
-        schedulerMap.update(scheduler);
-    }
-
-    private void deleteScheduler(BaseRequest<CommonDeleteRequest> userRequest) {
-        CommonDeleteRequest req = userRequest.getRequestPayload();
-        log.debug("CommonDeleteRequest received id = {}", req.getId());
-        Scheduler scheduler = schedulerMap.getSingleObjectByID(req.getId());
-        schedulerMap.delete(scheduler);
-    }
-
-}
diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TimetableService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TimetableService.java
deleted file mode 100644
index bc77439c0..000000000
--- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TimetableService.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package ru.spcex.clearing.scheduler.service;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.producer.Producer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import ru.clearing.classes.statics.data.scheduler.Timetable;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.schedule.TimetableNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.schedule.TimetableUpdateRequest;
-import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-
-@Service
-public class TimetableService extends QueueConsumer implements InitializingBean {
-    private final Logger log = LoggerFactory.getLogger(getClass());
-    private final Imdg<Timetable> timetableMap;
-
-    @Autowired
-    public TimetableService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
-                            ImdgProvider imdgProvider) {
-        super(kafkaQueue, kafkaProducer);
-        this.timetableMap = imdgProvider.getImdg(IMDGDistributedNames.Map_Timetable, Timetable.class);
-    }
-
-    @Override
-    public void afterPropertiesSet() {
-        callback(TimetableNewRequest.class)
-                .setConsumer(this::newTimetable)
-                .forDestination(Consts.DESTINATION_TIMETABLE_NEW, callbacks::put);
-        callback(TimetableUpdateRequest.class)
-                .setConsumer(this::updateTimetable)
-                .forDestination(Consts.DESTINATION_TIMETABLE_UPDATE, callbacks::put);
-        callback(CommonDeleteRequest.class)
-                .setConsumer(this::deleteTimetable)
-                .forDestination(Consts.DESTINATION_TIMETABLE_DELETE, callbacks::put);
-        init();
-    }
-
-    private void newTimetable(BaseRequest<TimetableNewRequest> userRequest) {
-        TimetableNewRequest req = userRequest.getRequestPayload();
-        log.debug("TimetableNewRequest received");
-        Timetable timetable = new Timetable();
-        timetable.setTask(req.getTask());
-        timetable.setTaskTime(req.getTaskTime());
-        timetable.setTaskStatus(req.getTaskStatus());
-        timetableMap.insert(timetable);
-        log.debug("successfully processed, new id {}", timetable.getId());
-    }
-
-    private void updateTimetable(BaseRequest<TimetableUpdateRequest> userRequest) {
-        TimetableUpdateRequest req = userRequest.getRequestPayload();
-        log.debug("TimetableNewRequest received");
-        Timetable timetable = timetableMap.getSingleObjectByID(req.getId());
-        timetable.setTask(req.getTask());
-        timetable.setTaskTime(req.getTaskTime());
-        timetable.setTaskStatus(req.getTaskStatus());
-        timetableMap.update(timetable);
-        log.debug("successfully processed, new id {}", timetable.getId());
-    }
-
-    private void deleteTimetable(BaseRequest<CommonDeleteRequest> userRequest) {
-        CommonDeleteRequest req = userRequest.getRequestPayload();
-        log.debug("CommonDeleteRequest received id = {}", req.getId());
-        Timetable timetable = timetableMap.getSingleObjectByID(req.getId());
-        timetableMap.delete(timetable);
-    }
-}
diff --git a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TradingCalendarService.java b/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TradingCalendarService.java
deleted file mode 100644
index baf9cbda6..000000000
--- a/clearing-parent/scheduler-service/src/main/java/ru/spcex/clearing/scheduler/service/TradingCalendarService.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package ru.spcex.clearing.scheduler.service;
-
-import org.apache.kafka.clients.consumer.Consumer;
-import org.apache.kafka.clients.producer.Producer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import ru.clearing.classes.statics.data.scheduler.TradingCalendar;
-import ru.spcex.clearing.imdg.IMDGDistributedNames;
-import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
-import ru.spcex.clearing.platform.messaging.domain.Consts;
-import ru.spcex.clearing.platform.messaging.domain.cud.common.CommonDeleteRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.schedule.TradingCalendarNewRequest;
-import ru.spcex.clearing.platform.messaging.domain.cud.schedule.TradingCalendarUpdateRequest;
-import ru.spcex.clearing.platform.messaging.service.QueueConsumer;
-import ru.spcex.platform.imdg.api.Imdg;
-import ru.spcex.platform.imdg.api.ImdgProvider;
-
-@Service
-public class TradingCalendarService extends QueueConsumer implements InitializingBean {
-    private final Logger log = LoggerFactory.getLogger(getClass());
-    private final Imdg<TradingCalendar> tradingCalendarMap;
-
-    @Autowired
-    public TradingCalendarService(Consumer<String, Object> kafkaQueue, Producer<String, Object> kafkaProducer,
-                                  ImdgProvider imdgProvider) {
-        super(kafkaQueue, kafkaProducer);
-        this.tradingCalendarMap = imdgProvider.getImdg(IMDGDistributedNames.Map_TradingCalendar, TradingCalendar.class);
-    }
-
-    @Override
-    public void afterPropertiesSet() {
-        callback(TradingCalendarNewRequest.class)
-                .setConsumer(this::newTradingCalendar)
-                .forDestination(Consts.DESTINATION_TRADING_CALENDAR_NEW, callbacks::put);
-        callback(TradingCalendarUpdateRequest.class)
-                .setConsumer(this::updateTradingCalendar)
-                .forDestination(Consts.DESTINATION_TRADING_CALENDAR_UPDATE, callbacks::put);
-        callback(CommonDeleteRequest.class)
-                .setConsumer(this::deleteTradingCalendar)
-                .forDestination(Consts.DESTINATION_TRADING_CALENDAR_DELETE, callbacks::put);
-        init();
-    }
-
-    private void newTradingCalendar(BaseRequest<TradingCalendarNewRequest> userRequest) {
-        TradingCalendarNewRequest req = userRequest.getRequestPayload();
-        log.debug("TradingCalendarNewRequest received");
-        TradingCalendar tradingCalendar = new TradingCalendar();
-        tradingCalendar.setClearingDate(req.getClearingDate());
-        tradingCalendar.setCompanyId(req.getCompanyId());
-        tradingCalendar.setTradingStatus(req.getTradingStatus());
-        tradingCalendarMap.insert(tradingCalendar);
-        log.debug("successfully processed, new id {}", tradingCalendar.getId());
-    }
-
-    private void updateTradingCalendar(BaseRequest<TradingCalendarUpdateRequest> userRequest) {
-        TradingCalendarUpdateRequest req = userRequest.getRequestPayload();
-        log.debug("TradingCalendarUpdateRequest received");
-        TradingCalendar tradingCalendar = tradingCalendarMap.getSingleObjectByID(req.getId());
-        tradingCalendar.setClearingDate(req.getClearingDate());
-        tradingCalendar.setCompanyId(req.getCompanyId());
-        tradingCalendar.setTradingStatus(req.getTradingStatus());
-        tradingCalendarMap.update(tradingCalendar);
-        log.debug("successfully processed, new id {}", tradingCalendar.getId());
-    }
-
-    private void deleteTradingCalendar(BaseRequest<CommonDeleteRequest> userRequest) {
-        CommonDeleteRequest req = userRequest.getRequestPayload();
-        log.debug("CommonDeleteRequest received id = {}", req.getId());
-        TradingCalendar tradingCalendar = tradingCalendarMap.getSingleObjectByID(req.getId());
-        tradingCalendarMap.delete(tradingCalendar);
-    }
-}
diff --git a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java
index 46fd312bb..b6bf66373 100644
--- a/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java
+++ b/platform-parent/platform-imdg-api/src/main/java/ru/spcex/clearing/imdg/IMDGDistributedNames.java
@@ -37,11 +37,11 @@ public final class IMDGDistributedNames {
     public static final String Map_UserConnectHistory = "Map_UserConnectHistory";
     public static final String Map_User = "Map_User";
     public static final String Map_UserHistory = "Map_UserHistory";
-    public static final String Map_TaskRunner = "Map_TaskRunner";
-    public static final String Map_SchedulerAllToday = "Map_SchedulerAllToday";
-    public static final String Map_Scheduler = "Map_Scheduler";
-    public static final String Map_TradingCalendar = "Map_TradingCalendar";
-    public static final String Map_Timetable = "Map_Timetable";
+    public static final String Map_Launcher = "Map_Launcher";
+    public static final String Map_PlannerAllToday = "Map_PlannerAllToday";
+    public static final String Map_Planner = "Map_Planner";
+    public static final String Map_ClearingCalendar = "Map_ClearingCalendar";
+    public static final String Map_PlannerTemplate = "Map_PlannerTemplate";
     public static final String Map_InDocumentJournal = "Map_InDocumentJournal";
     public static final String Map_OutDocumentJournal = "Map_OutDocumentJournal";
     public static final String Map_SDf01 = "Map_SDf01";
@@ -94,8 +94,8 @@ public final class IMDGDistributedNames {
     public static final String Map_ChargeDirectionDictionary = "Map_ChargeDirectionDictionary";
     public static final String Map_TaskDictionary = "Map_TaskDictionary";
     public static final String Map_TaskStatusDictionary = "Map_TaskStatusDictionary";
-    public static final String Map_TradingStatusDictionary = "Map_TradingStatusDictionary";
-    public static final String Map_SourceDictionary = "Map_SourceDictionary";
+    public static final String Map_DayStatusDictionary = "Map_DayStatusDictionary";
+    public static final String Map_ParentDictionary = "Map_ParentDictionary";
     public static final String Map_ConnectionStateDictionary = "Map_ConnectionStateDictionary";
     public static final String Map_UserRoleDictionary = "Map_UserRoleDictionary";
     public static final String Map_UserSettings = "Map_UserSettings";
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
index 2e4b2721b..34746ccb7 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/Consts.java
@@ -9,17 +9,17 @@ public interface Consts {
     String DESTINATION_KEY_RATE_UPDATE = "key-rate-update";
     String DESTINATION_KEY_RATE_DELETE = "key-rate-delete";
 
-    String DESTINATION_TIMETABLE_NEW = "timetable-new";
-    String DESTINATION_TIMETABLE_UPDATE = "timetable-update";
-    String DESTINATION_TIMETABLE_DELETE = "timetable-delete";
+    String DESTINATION_PLANNER_TEMPLATE_NEW = "planner-template-new";
+    String DESTINATION_PLANNER_TEMPLATE_UPDATE = "planner-template-update";
+    String DESTINATION_PLANNER_TEMPLATE_DELETE = "planner-template-delete";
 
-    String DESTINATION_TRADING_CALENDAR_NEW = "timetable-new";
-    String DESTINATION_TRADING_CALENDAR_UPDATE = "timetable-update";
-    String DESTINATION_TRADING_CALENDAR_DELETE = "timetable-delete";
+    String DESTINATION_CLEARING_CALENDAR_NEW = "clearing-calendar-new";
+    String DESTINATION_CLEARING_CALENDAR_UPDATE = "clearing-calendar-update";
+    String DESTINATION_CLEARING_CALENDAR_DELETE = "clearing-calendar-delete";
 
-    String DESTINATION_SCHEDULER_NEW = "scheduler-new";
-    String DESTINATION_SCHEDULER_UPDATE = "scheduler-update";
-    String DESTINATION_SCHEDULER_DELETE = "scheduler-delete";
+    String DESTINATION_PLANNER_NEW = "planner-new";
+    String DESTINATION_PLANNER_UPDATE = "planner-update";
+    String DESTINATION_PLANNER_DELETE = "planner-delete";
 
     String DESTINATION_COMPANY_DELETE = "company-delete";
     String DESTINATION_COMPANY_INFO_UPDATE = "company-info-update";
@@ -48,7 +48,7 @@ public interface Consts {
     String EXPORT_PROCESS = "export-process";
     String ACCOUNT_NEW = "account-new";
     String BALANCE_ACCOUNT_NEW = "balance-account-new";
-    String TASK_RUNNER_NEW = "task-runner-new";
+    String LAUNCHER_NEW = "launcher-new";
 
     String REQUEST_INFO_UPDATE = "request-info-update";
 
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TradingCalendarNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarNewRequest.java
similarity index 96%
rename from platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TradingCalendarNewRequest.java
rename to platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarNewRequest.java
index 2472babb8..06c61ac44 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TradingCalendarNewRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarNewRequest.java
@@ -8,7 +8,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSeria
 
 import java.time.LocalDate;
 
-public class TradingCalendarNewRequest {
+public class ClearingCalendarNewRequest {
     @JsonSerialize(using = LocalDateSerializer.class)
     @JsonDeserialize(using = LocalDateDeserializer.class)
     @JsonProperty
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TradingCalendarUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarUpdateRequest.java
similarity index 96%
rename from platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TradingCalendarUpdateRequest.java
rename to platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarUpdateRequest.java
index 7fb496a9a..aca653bea 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TradingCalendarUpdateRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/ClearingCalendarUpdateRequest.java
@@ -8,7 +8,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalDateSeria
 
 import java.time.LocalDate;
 
-public class TradingCalendarUpdateRequest {
+public class ClearingCalendarUpdateRequest {
     @JsonProperty
     public Long id;
 
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TaskRunnerCommandRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java
similarity index 92%
rename from platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TaskRunnerCommandRequest.java
rename to platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java
index b6138f3e3..4382eecb7 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TaskRunnerCommandRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/LauncherCommandRequest.java
@@ -2,7 +2,7 @@ package ru.spcex.clearing.platform.messaging.domain.cud.schedule;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class TaskRunnerCommandRequest {
+public class LauncherCommandRequest {
 
     @JsonProperty
     private Long userId;
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/SchedulerNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java
similarity index 98%
rename from platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/SchedulerNewRequest.java
rename to platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java
index 9b72792d3..c26568aab 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/SchedulerNewRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerNewRequest.java
@@ -11,7 +11,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSeria
 import java.time.LocalDate;
 import java.time.LocalTime;
 
-public class SchedulerNewRequest {
+public class PlannerNewRequest {
 
     @JsonProperty
     public String task;
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TimetableNewRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java
similarity index 96%
rename from platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TimetableNewRequest.java
rename to platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java
index ec178490d..7bafd0953 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TimetableNewRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateNewRequest.java
@@ -8,7 +8,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSeria
 
 import java.time.LocalTime;
 
-public class TimetableNewRequest {
+public class PlannerTemplateNewRequest {
     @JsonProperty
     public String task;
 
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TimetableUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java
similarity index 96%
rename from platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TimetableUpdateRequest.java
rename to platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java
index 210869118..6f1748334 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/TimetableUpdateRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerTemplateUpdateRequest.java
@@ -8,7 +8,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSeria
 
 import java.time.LocalTime;
 
-public class TimetableUpdateRequest {
+public class PlannerTemplateUpdateRequest {
     @JsonProperty
     public Long id;
 
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/SchedulerUpdateRequest.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java
similarity index 98%
rename from platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/SchedulerUpdateRequest.java
rename to platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java
index 6c46bee95..cfe58c797 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/SchedulerUpdateRequest.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/domain/cud/schedule/PlannerUpdateRequest.java
@@ -11,7 +11,7 @@ import ru.spcex.clearing.platform.messaging.domain.json.serialize.LocalTimeSeria
 import java.time.LocalDate;
 import java.time.LocalTime;
 
-public class SchedulerUpdateRequest {
+public class PlannerUpdateRequest {
 
     @JsonProperty
     public Long id;