diff --git a/contingent_report_desktop/Controller/BusinessLogic/AcademicLeaveOrderLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/AcademicLeaveOrderLogic.cs
index 4cec4b6..c67ea6a 100644
--- a/contingent_report_desktop/Controller/BusinessLogic/AcademicLeaveOrderLogic.cs
+++ b/contingent_report_desktop/Controller/BusinessLogic/AcademicLeaveOrderLogic.cs
@@ -2,31 +2,8 @@
 
 namespace Controller.BusinessLogic
 {
-    public class AcademicLeaveOrderLogic : AbstractLogic<NextCourseOrder>
+    public class AcademicLeaveOrderLogic
     {
-        public override NextCourseOrder add(NextCourseOrder entity)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override NextCourseOrder get(int id)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override List<NextCourseOrder> getAll()
-        {
-            throw new NotImplementedException();
-        }
-
-        public override NextCourseOrder remove(int id)
-        {
-            throw new NotImplementedException();
-        }
-
-        public override NextCourseOrder update(NextCourseOrder entity)
-        {
-            throw new NotImplementedException();
-        }
+ 
     }
 }
diff --git a/contingent_report_desktop/Controller/BusinessLogic/DeanLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/DeanLogic.cs
index 8ac8a49..243c25a 100644
--- a/contingent_report_desktop/Controller/BusinessLogic/DeanLogic.cs
+++ b/contingent_report_desktop/Controller/BusinessLogic/DeanLogic.cs
@@ -2,29 +2,29 @@
 
 namespace Controller.BusinessLogic
 {
-    public class DeanLogic : AbstractLogic<LearningPlan>
+    public class DeanLogic : AbstractLogic<User>
     {
-        public override LearningPlan add(LearningPlan entity)
+        public override User add(User entity)
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan get(int id)
+        public override User get(int id)
         {
             throw new NotImplementedException();
         }
 
-        public override List<LearningPlan> getAll()
+        public override List<User> getAll()
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan remove(int id)
+        public override User remove(int id)
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan update(LearningPlan entity)
+        public override User update(User entity)
         {
             throw new NotImplementedException();
         }
diff --git a/contingent_report_desktop/Controller/BusinessLogic/FacultLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/FacultLogic.cs
index f8ca222..a40e7b6 100644
--- a/contingent_report_desktop/Controller/BusinessLogic/FacultLogic.cs
+++ b/contingent_report_desktop/Controller/BusinessLogic/FacultLogic.cs
@@ -2,29 +2,29 @@
 
 namespace Controller.BusinessLogic
 {
-    public class FacultLogic : AbstractLogic<LearningPlan>
+    public class FacultLogic : AbstractLogic<User>
     {
-        public override LearningPlan add(LearningPlan entity)
+        public override User add(User entity)
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan get(int id)
+        public override User get(int id)
         {
             throw new NotImplementedException();
         }
 
-        public override List<LearningPlan> getAll()
+        public override List<User> getAll()
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan remove(int id)
+        public override User remove(int id)
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan update(LearningPlan entity)
+        public override User update(User entity)
         {
             throw new NotImplementedException();
         }
diff --git a/contingent_report_desktop/Controller/BusinessLogic/LearningPlanLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/LearningPlanLogic.cs
index d4b781d..fa34b02 100644
--- a/contingent_report_desktop/Controller/BusinessLogic/LearningPlanLogic.cs
+++ b/contingent_report_desktop/Controller/BusinessLogic/LearningPlanLogic.cs
@@ -2,29 +2,29 @@
 
 namespace Controller.BusinessLogic
 {
-    public class LearningPlanLogic : AbstractLogic<LearningPlan>
+    public class LearningPlanLogic : AbstractLogic<User>
     {
-        public override LearningPlan add(LearningPlan entity)
+        public override User add(User entity)
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan get(int id)
+        public override User get(int id)
         {
             throw new NotImplementedException();
         }
 
-        public override List<LearningPlan> getAll()
+        public override List<User> getAll()
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan remove(int id)
+        public override User remove(int id)
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan update(LearningPlan entity)
+        public override User update(User entity)
         {
             throw new NotImplementedException();
         }
diff --git a/contingent_report_desktop/Controller/BusinessLogic/SpecializationLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/SpecializationLogic.cs
index d979ed3..33ceacd 100644
--- a/contingent_report_desktop/Controller/BusinessLogic/SpecializationLogic.cs
+++ b/contingent_report_desktop/Controller/BusinessLogic/SpecializationLogic.cs
@@ -2,29 +2,29 @@
 
 namespace Controller.BusinessLogic
 {
-    public class SpecializationLogic : AbstractLogic<LearningPlan>
+    public class SpecializationLogic : AbstractLogic<User>
     {
-        public override LearningPlan add(LearningPlan entity)
+        public override User add(User entity)
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan get(int id)
+        public override User get(int id)
         {
             throw new NotImplementedException();
         }
 
-        public override List<LearningPlan> getAll()
+        public override List<User> getAll()
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan remove(int id)
+        public override User remove(int id)
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan update(LearningPlan entity)
+        public override User update(User entity)
         {
             throw new NotImplementedException();
         }
diff --git a/contingent_report_desktop/Controller/BusinessLogic/UserLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/UserLogic.cs
index 6813bc5..1ad1a82 100644
--- a/contingent_report_desktop/Controller/BusinessLogic/UserLogic.cs
+++ b/contingent_report_desktop/Controller/BusinessLogic/UserLogic.cs
@@ -2,29 +2,29 @@
 
 namespace Controller.BusinessLogic
 {
-    public class UserLogic : AbstractLogic<LearningPlan>
+    public class UserLogic : AbstractLogic<User>
     {
-        public override LearningPlan add(LearningPlan entity)
+        public override User add(User entity)
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan get(int id)
+        public override User get(int id)
         {
             throw new NotImplementedException();
         }
 
-        public override List<LearningPlan> getAll()
+        public override List<User> getAll()
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan remove(int id)
+        public override User remove(int id)
         {
             throw new NotImplementedException();
         }
 
-        public override LearningPlan update(LearningPlan entity)
+        public override User update(User entity)
         {
             throw new NotImplementedException();
         }
diff --git a/contingent_report_desktop/DataModels/Models/AbstractOrder.cs b/contingent_report_desktop/DataModels/Models/AbstractOrder.cs
index dd6f68a..12a6483 100644
--- a/contingent_report_desktop/DataModels/Models/AbstractOrder.cs
+++ b/contingent_report_desktop/DataModels/Models/AbstractOrder.cs
@@ -5,7 +5,7 @@ namespace DataModels.Models
 {
     public abstract class AbstractOrder : Model
     {
-        protected AbstractOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
+        protected AbstractOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
         {
             OrderType = orderType;
             Reason = reason;
@@ -15,7 +15,7 @@ namespace DataModels.Models
             Students = students;
         }
 
-        protected AbstractOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students) 
+        protected AbstractOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students) 
             : this(orderType, reason, number, currentDean, date, students)
         {
             Id = id;
@@ -25,7 +25,7 @@ namespace DataModels.Models
         public OrderType OrderType { get; set; }
         public Reason Reason { get; set; }
         public int Number {  get; set; }    
-        public LearningPlan? CurrentDean { get; set; }
+        public Dean? CurrentDean { get; set; }
         public DateTime Date {  get; set; } = DateTime.Now;
 
         public abstract string TemplatePath { get; }
@@ -36,7 +36,5 @@ namespace DataModels.Models
             FillTemplate(doc);
             doc.SaveAs(path);
         }
-
-
     }
 }
diff --git a/contingent_report_desktop/DataModels/Models/ContingentReport.cs b/contingent_report_desktop/DataModels/Models/ContingentReport.cs
index 5f47d7a..7d62e62 100644
--- a/contingent_report_desktop/DataModels/Models/ContingentReport.cs
+++ b/contingent_report_desktop/DataModels/Models/ContingentReport.cs
@@ -5,7 +5,7 @@ namespace DataModels.Models
     public class ContingentReport<T> where T : class
     {
         public List<T?>? Contingent { get; set; }
-        public LearningPlan? CurrentDean { get; set; }
+        public Dean? CurrentDean { get; set; }
         public DateTime? Date { get; set; } = DateTime.Now;
 
         public string TemplatePath { get; } = string.Empty;
diff --git a/contingent_report_desktop/DataModels/Models/Dean.cs b/contingent_report_desktop/DataModels/Models/Dean.cs
index ad07894..6610b87 100644
--- a/contingent_report_desktop/DataModels/Models/Dean.cs
+++ b/contingent_report_desktop/DataModels/Models/Dean.cs
@@ -1,8 +1,8 @@
 namespace DataModels.Models
 {
-    public class LearningPlan : LearningPlan
+    public class Dean : User
     {
-        public LearningPlan(string fIO, string email, string password, int code2FA, DateTime date2FA)
+        public Dean(string fIO, string email, string password, int code2FA, DateTime date2FA)
             : base(fIO, email, password, code2FA, date2FA)
         {
             FIO = fIO;
@@ -11,7 +11,7 @@
             Code2FA = code2FA;
         }
 
-        public LearningPlan(int id, string fio, string email, string password, int code2FA, DateTime date2FA) 
+        public Dean(int id, string fio, string email, string password, int code2FA, DateTime date2FA) 
             : base(id, fio, email, password, code2FA, date2FA)
         {
             Id = id;
diff --git a/contingent_report_desktop/DataModels/Models/Facult.cs b/contingent_report_desktop/DataModels/Models/Facult.cs
index a5a823a..f1bfef3 100644
--- a/contingent_report_desktop/DataModels/Models/Facult.cs
+++ b/contingent_report_desktop/DataModels/Models/Facult.cs
@@ -1,19 +1,19 @@
 namespace DataModels.Models
 {
-    public class LearningPlan : Model
+    public class Facult : Model
     {
-        public LearningPlan(string name, LearningPlan dean)
+        public Facult(string name, Dean dean)
         {
             Name = name;
             Dean = dean;
         }
 
-        public LearningPlan(int id, string name, LearningPlan dean) : this(name, dean) 
+        public Facult(int id, string name, Dean dean) : this(name, dean) 
         {
             Id = id;
         }
 
         public string Name { get; set; } = string.Empty;
-        public LearningPlan? Dean { get; set; }
+        public Dean? Dean { get; set; }
     }
 }
diff --git a/contingent_report_desktop/DataModels/Models/Group.cs b/contingent_report_desktop/DataModels/Models/Group.cs
index 1b0f56a..78cf465 100644
--- a/contingent_report_desktop/DataModels/Models/Group.cs
+++ b/contingent_report_desktop/DataModels/Models/Group.cs
@@ -7,9 +7,9 @@
         public int Number {  get; set; }
         public int Course { get; set; }
         public int MaxStudentCount { get; set; } = 30;
-        public LearningPlan? Specialization { get; set; }
+        public Specialization? Specialization { get; set; }
 
-        public Group(string name, int num, int course, LearningPlan spec)
+        public Group(string name, int num, int course, Specialization spec)
         {
             Name = name;
             Number = num;
@@ -18,7 +18,7 @@
             MaxStudentCount = 30;
         }
 
-        public Group(int id, string name, int num, int course, LearningPlan spec) 
+        public Group(int id, string name, int num, int course, Specialization spec) 
             : this(name, num, course, spec)
         {
             Id = id;
diff --git a/contingent_report_desktop/DataModels/Models/LearningPlan.cs b/contingent_report_desktop/DataModels/Models/LearningPlan.cs
index 046ba0d..d78fedc 100644
--- a/contingent_report_desktop/DataModels/Models/LearningPlan.cs
+++ b/contingent_report_desktop/DataModels/Models/LearningPlan.cs
@@ -2,6 +2,6 @@
 {
     public class LearningPlan
     {
-        public LearningPlan Specialization { get; set; }
+        public Specialization? Specialization { get; set; }
     }
 }
diff --git a/contingent_report_desktop/DataModels/Models/Specialization.cs b/contingent_report_desktop/DataModels/Models/Specialization.cs
index d2ec4ba..a682ef8 100644
--- a/contingent_report_desktop/DataModels/Models/Specialization.cs
+++ b/contingent_report_desktop/DataModels/Models/Specialization.cs
@@ -1,18 +1,18 @@
 namespace DataModels.Models
 {
-    public class LearningPlan : Model
+    public class Specialization : Model
     {
         public string Name { get; set; } = string.Empty;
         public string Code { get; set; } = string.Empty;
-        public LearningPlan? Facult { get; set; }
-        public LearningPlan(LearningPlan facult, string name, string code)
+        public Facult? Facult { get; set; }
+        public Specialization(Facult facult, string name, string code)
         {
             Facult = facult;
             Name = name;
             Code = code;
         }
 
-        public LearningPlan(LearningPlan facult, string name, string code, int id) : this(facult, name, code )
+        public Specialization(Facult facult, string name, string code, int id) : this(facult, name, code )
         {
             Id = id;
         }
diff --git a/contingent_report_desktop/DataModels/Models/Student.cs b/contingent_report_desktop/DataModels/Models/Student.cs
index 0cd82df..601206d 100644
--- a/contingent_report_desktop/DataModels/Models/Student.cs
+++ b/contingent_report_desktop/DataModels/Models/Student.cs
@@ -1,9 +1,9 @@
 
 namespace DataModels.Models
 {
-    public class Student : LearningPlan
+    public class Student : User
     {
-        public Student(string fIO, string email, string password, int code2FA, DateTime date2FA, LearningPlan spec, Group group) 
+        public Student(string fIO, string email, string password, int code2FA, DateTime date2FA, Specialization spec, Group group) 
             : base(fIO, email, password, code2FA, date2FA)
         {
             FIO = fIO;
@@ -21,7 +21,7 @@ namespace DataModels.Models
             Id = id;
         }
 
-        public LearningPlan? Specialization { get; set; }
+        public Specialization? Specialization { get; set; }
         public Group? Group { get; set; }
 
     }
diff --git a/contingent_report_desktop/DataModels/Models/User.cs b/contingent_report_desktop/DataModels/Models/User.cs
index 424f8ae..2e2e603 100644
--- a/contingent_report_desktop/DataModels/Models/User.cs
+++ b/contingent_report_desktop/DataModels/Models/User.cs
@@ -1,8 +1,8 @@
 namespace DataModels.Models
 {
-    public class LearningPlan : Model
+    public class User : Model
     {
-        public LearningPlan(string fIO, string email, string password, int code2FA, DateTime date2FA)
+        public User(string fIO, string email, string password, int code2FA, DateTime date2FA)
         {
             FIO = fIO;
             Email = email;
@@ -11,7 +11,7 @@
             Date2FA = date2FA;
         }
 
-        public LearningPlan(int id, string fio, string email, string password, int code2FA, DateTime date2FA)
+        public User(int id, string fio, string email, string password, int code2FA, DateTime date2FA)
             : this(fio, email, password, code2FA, date2FA)
         {
             Id = id; 
diff --git a/contingent_report_desktop/DataModels/Orders/AcademicLeaveOrder.cs b/contingent_report_desktop/DataModels/Orders/AcademicLeaveOrder.cs
index e8ff29f..ab02a54 100644
--- a/contingent_report_desktop/DataModels/Orders/AcademicLeaveOrder.cs
+++ b/contingent_report_desktop/DataModels/Orders/AcademicLeaveOrder.cs
@@ -4,17 +4,17 @@ using Xceed.Words.NET;
 
 namespace DataModels.Orders
 {
-    public class NextCourseOrder : AbstractOrder
+    public class AcademicLeaveOrder : AbstractOrder
     {
         public DateTime? DateStart { get; set; }
         public DateTime? DateEnd { get; set; }
 
-        public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students) 
+        public AcademicLeaveOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students) 
             : base(orderType, reason, number, currentDean, date, students)
         {
         }
 
-        public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students) 
+        public AcademicLeaveOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students) 
             : base(id, orderType, reason, number, currentDean, date, students)
         {
             Id = id;
diff --git a/contingent_report_desktop/DataModels/Orders/AddStudentsOrder.cs b/contingent_report_desktop/DataModels/Orders/AddStudentsOrder.cs
index 54acc2f..6deb1cc 100644
--- a/contingent_report_desktop/DataModels/Orders/AddStudentsOrder.cs
+++ b/contingent_report_desktop/DataModels/Orders/AddStudentsOrder.cs
@@ -4,14 +4,14 @@ using Xceed.Words.NET;
 
 namespace DataModels.Orders
 {
-    public class NextCourseOrder : AbstractOrder
+    public class AddStudentsOrder : AbstractOrder
     {
-        public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students) 
+        public AddStudentsOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students) 
             : base(orderType, reason, number, currentDean, date, students)
         {
         }
 
-        public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students) 
+        public AddStudentsOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students) 
             : base(id, orderType, reason, number, currentDean, date, students)
         {
             Id = id;
diff --git a/contingent_report_desktop/DataModels/Orders/ChangeSpecializationOrder.cs b/contingent_report_desktop/DataModels/Orders/ChangeSpecializationOrder.cs
index 4c7ab9b..ddc72a3 100644
--- a/contingent_report_desktop/DataModels/Orders/ChangeSpecializationOrder.cs
+++ b/contingent_report_desktop/DataModels/Orders/ChangeSpecializationOrder.cs
@@ -6,18 +6,18 @@ namespace DataModels.Orders
 {
     public class ChangeSpecializationOrder : AbstractOrder
     {
-        public ChangeSpecializationOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students) 
+        public ChangeSpecializationOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students) 
             : base(orderType, reason, number, currentDean, date, students)
         {
         }
 
-        public ChangeSpecializationOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, 
+        public ChangeSpecializationOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, 
             List<Student> students) : base(id, orderType, reason, number, currentDean, date, students)
         {
             Id = id;
         }
 
-        public LearningPlan? NewSpec { get; set; }
+        public Specialization? NewSpec { get; set; }
 
         public override string TemplatePath => throw new NotImplementedException();
 
diff --git a/contingent_report_desktop/DataModels/Orders/ExpulsionOrder.cs b/contingent_report_desktop/DataModels/Orders/ExpulsionOrder.cs
index 54acc2f..87e9d6b 100644
--- a/contingent_report_desktop/DataModels/Orders/ExpulsionOrder.cs
+++ b/contingent_report_desktop/DataModels/Orders/ExpulsionOrder.cs
@@ -4,14 +4,14 @@ using Xceed.Words.NET;
 
 namespace DataModels.Orders
 {
-    public class NextCourseOrder : AbstractOrder
+    public class ExpulsionOrder : AbstractOrder
     {
-        public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students) 
+        public ExpulsionOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students) 
             : base(orderType, reason, number, currentDean, date, students)
         {
         }
 
-        public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students) 
+        public ExpulsionOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students) 
             : base(id, orderType, reason, number, currentDean, date, students)
         {
             Id = id;
diff --git a/contingent_report_desktop/DataModels/Orders/NextCourseOrder.cs b/contingent_report_desktop/DataModels/Orders/NextCourseOrder.cs
index 54acc2f..cb658a8 100644
--- a/contingent_report_desktop/DataModels/Orders/NextCourseOrder.cs
+++ b/contingent_report_desktop/DataModels/Orders/NextCourseOrder.cs
@@ -6,12 +6,12 @@ namespace DataModels.Orders
 {
     public class NextCourseOrder : AbstractOrder
     {
-        public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students) 
+        public NextCourseOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students) 
             : base(orderType, reason, number, currentDean, date, students)
         {
         }
 
-        public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students) 
+        public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students) 
             : base(id, orderType, reason, number, currentDean, date, students)
         {
             Id = id;