diff --git a/hwproj.front/src/components/Courses/Course.tsx b/hwproj.front/src/components/Courses/Course.tsx
index cb7edc7dc..3aea4dbb0 100644
--- a/hwproj.front/src/components/Courses/Course.tsx
+++ b/hwproj.front/src/components/Courses/Course.tsx
@@ -295,7 +295,7 @@ const Course: React.FC = () => {
                             if (value === 2 && !isExpert) navigate(`/courses/${courseId}/applications`)
                         }}
                     >
-                        {!isExpert && <Tab label="Домашние задания"/>}
+                        {!isExpert && <Tab label="Задания"/>}
                         {showStatsTab && <Tab label={
                             <Stack direction="row" spacing={1}>
                                 <div>Решения</div>
diff --git a/hwproj.front/src/components/Courses/CourseFilter.tsx b/hwproj.front/src/components/Courses/CourseFilter.tsx
index 752886c75..7e00c1e1c 100644
--- a/hwproj.front/src/components/Courses/CourseFilter.tsx
+++ b/hwproj.front/src/components/Courses/CourseFilter.tsx
@@ -117,11 +117,11 @@ const CourseFilter: FC<ICourseFilterProps> = (props) => {
                                     <TextField
                                         {...params}
                                         variant="outlined"
-                                        label={state.selectedHomeworks.length === 0 ? "" : "Домашние работы"}
-                                        placeholder={state.selectedHomeworks.length === 0 ? "Все домашние работы" : ""}
+                                        label={state.selectedHomeworks.length === 0 ? "" : "Задания"}
+                                        placeholder={state.selectedHomeworks.length === 0 ? "Все задания" : ""}
                                     />
                                 )}
-                                noOptionsText={'На курсе больше нет домашних работ'}
+                                noOptionsText={'На курсе больше нет заданий'}
                                 value={state.selectedHomeworks}
                                 onChange={(_, values) => {
                                     setState((prevState) => ({
diff --git a/hwproj.front/src/components/Homeworks/AddHomework.tsx b/hwproj.front/src/components/Homeworks/AddHomework.tsx
index a31497949..c28d6ed4f 100644
--- a/hwproj.front/src/components/Homeworks/AddHomework.tsx
+++ b/hwproj.front/src/components/Homeworks/AddHomework.tsx
@@ -255,7 +255,7 @@ const AddHomework: React.FC<IAddHomeworkProps> = (props) => {
                         type="submit"
                         disabled={addHomeworkState.hasErrors || addHomeworkState.tasks.some(t => t.hasErrors)}
                     >
-                        Добавить домашнее задание
+                        Добавить задание
                     </Button>
                     &nbsp;
                     <Button
diff --git a/hwproj.front/src/components/Homeworks/EditHomework.tsx b/hwproj.front/src/components/Homeworks/EditHomework.tsx
index 14edac769..3bd07fa07 100644
--- a/hwproj.front/src/components/Homeworks/EditHomework.tsx
+++ b/hwproj.front/src/components/Homeworks/EditHomework.tsx
@@ -126,7 +126,7 @@ const EditHomework: FC = () => {
         if (!editHomework.courseMentorIds.includes(ApiSingleton.authService.getUserId())) {
             return (
                 <Typography variant="h6" gutterBottom>
-                    Только преподаватель может редактировать домашнюю работу
+                    Только преподаватель может редактировать задание
                 </Typography>
             );
         }
@@ -151,7 +151,7 @@ const EditHomework: FC = () => {
                     </div>
                     <div>
                         <Typography style={{fontSize: '22px'}}>
-                            Редактировать домашнее задание
+                            Редактировать задание
                         </Typography>
                     </div>
                 </div>
@@ -223,7 +223,7 @@ const EditHomework: FC = () => {
                             variant="contained"
                             type="submit"
                             disabled={isSomeTaskSoonerThanHomework || editHomework.hasErrors}>
-                            Редактировать домашнее задание
+                            Редактировать задание
                         </Button>
                     </Grid>
                 </form>
diff --git a/hwproj.front/src/components/Homeworks/Homework.tsx b/hwproj.front/src/components/Homeworks/Homework.tsx
index d0522d49d..ebe404b3d 100644
--- a/hwproj.front/src/components/Homeworks/Homework.tsx
+++ b/hwproj.front/src/components/Homeworks/Homework.tsx
@@ -175,8 +175,8 @@ const Homework: FC<IHomeworkProps> = (props) => {
                 onCancel={closeDialogDeleteHomework}
                 onSubmit={deleteHomework}
                 isOpen={isOpenDialogDeleteHomework}
-                dialogTitle={'Удаление домашнего задания'}
-                dialogContentText={`Вы точно хотите удалить домашнее задание "${props.homework.title}"?`}
+                dialogTitle={'Удаление задания'}
+                dialogContentText={`Вы точно хотите удалить задание "${props.homework.title}"?`}
                 confirmationWord={''}
                 confirmationText={''}
             />
diff --git a/hwproj.front/src/components/Notifications.tsx b/hwproj.front/src/components/Notifications.tsx
index 6ce8b8818..bce4e0ebc 100644
--- a/hwproj.front/src/components/Notifications.tsx
+++ b/hwproj.front/src/components/Notifications.tsx
@@ -240,7 +240,7 @@ const Notifications: FC<IProfileProps> = (props) => {
                                             value={CategoryEnum.NUMBER_3}
                                             inputProps={{'aria-label': 'controlled'}}
                                         />
-                                    } label="Домашние задания"
+                                    } label="Задания"
                                     />
                                     {allNotSeen.length != 0 &&
                                         <Button fullWidth variant="contained" onClick={markAllNotificationsAsSeen}>Прочитать
diff --git a/hwproj.front/src/components/Solutions/UnratedSolutions.tsx b/hwproj.front/src/components/Solutions/UnratedSolutions.tsx
index 885ffc7f3..fe79ae960 100644
--- a/hwproj.front/src/components/Solutions/UnratedSolutions.tsx
+++ b/hwproj.front/src/components/Solutions/UnratedSolutions.tsx
@@ -162,10 +162,10 @@ const UnratedSolutions: FC<IUnratedSolutionsProps> = (props) => {
                     {renderSelect("Курс", "coursesFilter", filtersState.coursesFilter, filtersState.courses)}
                 </Grid>
                 <Grid item>
-                    {renderSelect("Домашняя работа", "homeworksFilter", filtersState.homeworksFilter, filtersState.homeworks)}
+                    {renderSelect("Задание", "homeworksFilter", filtersState.homeworksFilter, filtersState.homeworks)}
                 </Grid>
                 <Grid item>
-                    {renderSelect("Задание", "tasksFilter", filtersState.tasksFilter, filtersState.tasks)}
+                    {renderSelect("Задача", "tasksFilter", filtersState.tasksFilter, filtersState.tasks)}
                 </Grid>
                 <Grid item>
                     {renderSelect("Студент", "studentsFilter", filtersState.studentsFilter, filtersState.students)}