diff --git a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp
index 110c211..3525353 100644
--- a/InstructorsAndTrainees/tasks/ammtaskswidget.cpp
+++ b/InstructorsAndTrainees/tasks/ammtaskswidget.cpp
@@ -51,11 +51,10 @@ AMMtasksWidget::AMMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
     waitAnimationWidget->moveToThread(threadAnimation);
     threadAnimation->start();
 
+    ui->btnDelete->setObjectName("btnDelete");
     ui->btnDelete->setEnabled(false);
     if(type == TypeList::listCommon)
         ui->btnDelete->setVisible(false);
-
-    ui->btnDelete->setObjectName("btnDelete");
 }
 
 AMMtasksWidget::~AMMtasksWidget()
diff --git a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp
index d087fde..f832f3c 100644
--- a/InstructorsAndTrainees/tasks/fimtaskswidget.cpp
+++ b/InstructorsAndTrainees/tasks/fimtaskswidget.cpp
@@ -42,11 +42,10 @@ FIMtasksWidget::FIMtasksWidget(ConnectorToServer* connectorToServer, TypeList ty
     waitAnimationWidget->moveToThread(threadAnimation);
     threadAnimation->start();
 
+    ui->btnDelete->setObjectName("btnDelete");
     ui->btnDelete->setEnabled(false);
     if(type == TypeList::listCommon)
         ui->btnDelete->setVisible(false);
-
-    ui->btnDelete->setObjectName("btnDelete");
 }
 
 FIMtasksWidget::~FIMtasksWidget()
diff --git a/ServerLMS/Data/PacketType.h b/ServerLMS/Data/PacketType.h
index 67f64c3..3b1929d 100644
--- a/ServerLMS/Data/PacketType.h
+++ b/ServerLMS/Data/PacketType.h
@@ -27,8 +27,8 @@ enum PacketType
     TYPE_XMLANSWER_QUERY_DB__LIST_COMPUTERS = 103,
     TYPE_XMLANSWER_QUERY_DB__LIST_CLASSROOMS = 104,
 
-    TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE = 106,
-    TYPE_XMLANSWER_QUERY_TASKS_FIM_FOR_TRAINEE = 107,
+    TYPE_XMLANSWER_QUERY_TASKS_AMM_OF_TRAINEE = 106,
+    TYPE_XMLANSWER_QUERY_TASKS_FIM_OF_TRAINEE = 107,
 
     //xml-ответы на запросы AdditionalFiles
     TYPE_XMLANSWER_QUERY_TASKS_XML_FIM = 130,
diff --git a/ServerLMS/Systems/processingsystem.cpp b/ServerLMS/Systems/processingsystem.cpp
index 6b0be10..f37dd50 100644
--- a/ServerLMS/Systems/processingsystem.cpp
+++ b/ServerLMS/Systems/processingsystem.cpp
@@ -95,12 +95,12 @@ void ProcessingSystem::processingClientAutorization(ClientHandler *client, Clien
         //AMM
         QList<TaskAmmFim> listTasksAMM = providerDBLMS->GetListTasksAMMofTrainee(id_trainee);
         QByteArray arrayAnswerTasksAMM = dataParser->DbAnswer()->listTasksAMMofTrainee(true, &listTasksAMM, id_trainee);
-        client->sendXmlAnswer(arrayAnswerTasksAMM, PacketType::TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE);
+        client->sendXmlAnswer(arrayAnswerTasksAMM, PacketType::TYPE_XMLANSWER_QUERY_TASKS_AMM_OF_TRAINEE);
 
         //FIM
         QList<TaskAmmFim> listTasksFIM = providerDBLMS->GetListTasksFIMofTrainee(id_trainee);
         QByteArray arrayAnswerFIM = dataParser->DbAnswer()->listTasksFIMofTrainee(true, &listTasksFIM, id_trainee);
-        client->sendXmlAnswer(arrayAnswerFIM, PacketType::TYPE_XMLANSWER_QUERY_TASKS_FIM_FOR_TRAINEE);
+        client->sendXmlAnswer(arrayAnswerFIM, PacketType::TYPE_XMLANSWER_QUERY_TASKS_FIM_OF_TRAINEE);
     }
 
     QString str = QString(arrayAnswer);
@@ -157,9 +157,8 @@ void ProcessingSystem::processingClientDeAutorization(ClientHandler *client, Cli
 
 void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQueryToDB clientQueryToDB, int id, void* data)
 {
-    QByteArray arrayAnswer;
-
     qDebug() << "ProcessingQueryThread " << QThread::currentThreadId();
+
     switch (clientQueryToDB.typeQuery)
     {
         case TypeQueryToDB::TYPE_QUERY_GET_ALL_LISTS:
@@ -168,6 +167,8 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
             QList<Trainee> listTrainees = providerDBLMS->GetListAllTrainees();
             QList<Group> listGroups = providerDBLMS->GetListAllGroups();
 
+            QByteArray arrayAnswer;
+
             arrayAnswer = dataParser->DbAnswer()->listInstructors(true, &listInstructors);
             client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_DB__LIST_INSTRUCTORS);
 
@@ -261,9 +262,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
                 sendListTasksAMMofTraineetoClient(client, id);
 
                 //Отправка списка задач AMM клиенту Юнити
-                if(ClientHandler* handler = getUnityClientById(id))
+                if(ClientHandler* clientUnity = getUnityClientById(id))
                 {//Есть такой
-                    sendListTasksAMMofTraineetoClient(handler, id);
+                    sendListTasksAMMofTraineetoClient(clientUnity, id);
                 }
             }
             break;
@@ -276,9 +277,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
                 sendListTasksFIMofTraineetoClient(client, id);
 
                 //Отправка списка задач FIM клиенту Юнити
-                if(ClientHandler* handler = getUnityClientById(id))
+                if(ClientHandler* clientUnity = getUnityClientById(id))
                 {//Есть такой
-                    sendListTasksFIMofTraineetoClient(handler, id);
+                    sendListTasksFIMofTraineetoClient(clientUnity, id);
                 }
             }
             break;
@@ -305,9 +306,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
                 sendListTasksAMMofTraineetoClient(client, id_trainee);
 
                 //Отправка списка задач AMM клиенту Юнити
-                if(ClientHandler* handler = getUnityClientById(id_trainee))
+                if(ClientHandler* clientUnity = getUnityClientById(id_trainee))
                 {//Есть такой
-                    sendListTasksAMMofTraineetoClient(handler, id_trainee);
+                    sendListTasksAMMofTraineetoClient(clientUnity, id_trainee);
                 }
             }
             break;
@@ -320,9 +321,9 @@ void ProcessingSystem::processingClientQueryToDB(ClientHandler *client, ClientQu
                 sendListTasksFIMofTraineetoClient(client, id_trainee);
 
                 //Отправка списка задач FIM клиенту Юнити
-                if(ClientHandler* handler = getUnityClientById(id_trainee))
+                if(ClientHandler* clientUnity = getUnityClientById(id_trainee))
                 {//Есть такой
-                    sendListTasksFIMofTraineetoClient(handler, id_trainee);
+                    sendListTasksFIMofTraineetoClient(clientUnity, id_trainee);
                 }
             }            
             break;
@@ -423,14 +424,14 @@ void ProcessingSystem::sendListTasksAMMofTraineetoClient(ClientHandler *client,
 {
     QList<TaskAmmFim> listTasks = providerDBLMS->GetListTasksAMMofTrainee(id_trainee);
     QByteArray arrayAnswer = dataParser->DbAnswer()->listTasksAMMofTrainee(true, &listTasks, id_trainee);
-    client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_TASKS_AMM_FOR_TRAINEE);
+    client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_TASKS_AMM_OF_TRAINEE);
 }
 
 void ProcessingSystem::sendListTasksFIMofTraineetoClient(ClientHandler *client, int id_trainee)
 {
     QList<TaskAmmFim> listTasks = providerDBLMS->GetListTasksFIMofTrainee(id_trainee);
     QByteArray arrayAnswer = dataParser->DbAnswer()->listTasksFIMofTrainee(true, &listTasks, id_trainee);
-    client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_TASKS_FIM_FOR_TRAINEE);
+    client->sendXmlAnswer(arrayAnswer, PacketType::TYPE_XMLANSWER_QUERY_TASKS_FIM_OF_TRAINEE);
 }
 
 ClientHandler *ProcessingSystem::getUnityClientById(int id)