diff --git a/.gitignore b/.gitignore
index a820f4a..505b6b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,6 @@ build/
 .vscode/
 
 ###API_KEYS###
-src/main/java/com/Samsung/TaskTracker_Server/Repository/API_KEYS.java
+src/main/java/com/Samsung/TaskTraker_Server/Repository/API_KEYS.java
 
 
diff --git a/pom.xml b/pom.xml
index e213b0a..d554590 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,9 +9,9 @@
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.Samsung</groupId>
-	<artifactId>TaskTracker_Server</artifactId>
+	<artifactId>TaskTraker_Server</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
-	<name>TaskTracker_Server</name>
+	<name>TaskTraker_Server</name>
 	<description>Demo project for Spring Boot</description>
 	<url/>
 	<licenses>
diff --git a/src/main/java/com/Samsung/TaskTracker_Server/Repository/DataBase.java b/src/main/java/com/Samsung/TaskTraker_Server/Repository/DataBase.java
similarity index 97%
rename from src/main/java/com/Samsung/TaskTracker_Server/Repository/DataBase.java
rename to src/main/java/com/Samsung/TaskTraker_Server/Repository/DataBase.java
index 171c4c1..d7d7115 100644
--- a/src/main/java/com/Samsung/TaskTracker_Server/Repository/DataBase.java
+++ b/src/main/java/com/Samsung/TaskTraker_Server/Repository/DataBase.java
@@ -1,4 +1,4 @@
-package com.Samsung.TaskTracker_Server.Repository;
+package com.Samsung.TaskTraker_Server.Repository;
 
 import java.io.*;
 import java.sql.*;
@@ -96,7 +96,6 @@ public class DataBase {
         saveUser_stmt.setString(1, user.getLogin());
         saveUser_stmt.setString(2, user.getPassword());
         saveUser_stmt.setString(3, Serialize(user.getTaskList()));
-        //saveUser_stmt.executeUpdate();
         TaskDBList.add(new TaskDB(saveUser_stmt));
     }
 
diff --git a/src/main/java/com/Samsung/TaskTracker_Server/Repository/Task.java b/src/main/java/com/Samsung/TaskTraker_Server/Repository/Task.java
similarity index 95%
rename from src/main/java/com/Samsung/TaskTracker_Server/Repository/Task.java
rename to src/main/java/com/Samsung/TaskTraker_Server/Repository/Task.java
index 8b04523..80b22e2 100644
--- a/src/main/java/com/Samsung/TaskTracker_Server/Repository/Task.java
+++ b/src/main/java/com/Samsung/TaskTraker_Server/Repository/Task.java
@@ -1,4 +1,4 @@
-package com.Samsung.TaskTracker_Server.Repository;
+package com.Samsung.TaskTraker_Server.Repository;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/com/Samsung/TaskTracker_Server/Repository/User.java b/src/main/java/com/Samsung/TaskTraker_Server/Repository/User.java
similarity index 94%
rename from src/main/java/com/Samsung/TaskTracker_Server/Repository/User.java
rename to src/main/java/com/Samsung/TaskTraker_Server/Repository/User.java
index 9ee7320..6ac7f95 100644
--- a/src/main/java/com/Samsung/TaskTracker_Server/Repository/User.java
+++ b/src/main/java/com/Samsung/TaskTraker_Server/Repository/User.java
@@ -1,4 +1,4 @@
-package com.Samsung.TaskTracker_Server.Repository;
+package com.Samsung.TaskTraker_Server.Repository;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -42,7 +42,7 @@ public class User {
 
     public void addTask(Task task) {
         if(TaskList.contains(task)) {
-            TaskList.remove(task); // Просто удаляем потаму, что равнение идёт только по ID
+            TaskList.remove(task); // Просто удаляем потаму, что cравнение идёт только по ID
             TaskList.add(task);
         }
         else {
diff --git a/src/main/java/com/Samsung/TaskTracker_Server/Repository/UserRepository.java b/src/main/java/com/Samsung/TaskTraker_Server/Repository/UserRepository.java
similarity index 96%
rename from src/main/java/com/Samsung/TaskTracker_Server/Repository/UserRepository.java
rename to src/main/java/com/Samsung/TaskTraker_Server/Repository/UserRepository.java
index 1f9f30d..dd8e7c8 100644
--- a/src/main/java/com/Samsung/TaskTracker_Server/Repository/UserRepository.java
+++ b/src/main/java/com/Samsung/TaskTraker_Server/Repository/UserRepository.java
@@ -1,4 +1,4 @@
-package com.Samsung.TaskTracker_Server.Repository;
+package com.Samsung.TaskTraker_Server.Repository;
 
 import java.sql.SQLException;
 import java.util.*;
diff --git a/src/main/java/com/Samsung/TaskTracker_Server/TaskTrackerServerApplication.java b/src/main/java/com/Samsung/TaskTraker_Server/TaskTrakerServerApplication.java
similarity index 95%
rename from src/main/java/com/Samsung/TaskTracker_Server/TaskTrackerServerApplication.java
rename to src/main/java/com/Samsung/TaskTraker_Server/TaskTrakerServerApplication.java
index c59a084..a30cddc 100644
--- a/src/main/java/com/Samsung/TaskTracker_Server/TaskTrackerServerApplication.java
+++ b/src/main/java/com/Samsung/TaskTraker_Server/TaskTrakerServerApplication.java
@@ -1,11 +1,9 @@
-package com.Samsung.TaskTracker_Server;
+package com.Samsung.TaskTraker_Server;
 
-import com.Samsung.TaskTracker_Server.Repository.*;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.Samsung.TaskTraker_Server.Repository.*;
 import org.springframework.boot.ExitCodeGenerator;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,10 +14,10 @@ import java.util.List;
 @RestController
 @RequestMapping("/")
 @SpringBootApplication
-public class TaskTrackerServerApplication {
+public class TaskTrakerServerApplication {
     private static volatile boolean isRunning = true;
     public static void main(String[] args) {
-        ConfigurableApplicationContext context = SpringApplication.run(TaskTrackerServerApplication.class, args);
+        ConfigurableApplicationContext context = SpringApplication.run(TaskTrakerServerApplication.class, args);
 
         while (isRunning) {
             try {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 82066fc..7d7df04 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1 +1 @@
-spring.application.name=TaskTracker_Server
+spring.application.name=TaskTraker_Server
diff --git a/src/test/java/com/Samsung/TaskTracker_Server/TaskTrackerServerApplicationTests.java b/src/test/java/com/Samsung/TaskTraker_Server/TaskTrakerServerApplicationTests.java
similarity index 64%
rename from src/test/java/com/Samsung/TaskTracker_Server/TaskTrackerServerApplicationTests.java
rename to src/test/java/com/Samsung/TaskTraker_Server/TaskTrakerServerApplicationTests.java
index 3e314f0..d584398 100644
--- a/src/test/java/com/Samsung/TaskTracker_Server/TaskTrackerServerApplicationTests.java
+++ b/src/test/java/com/Samsung/TaskTraker_Server/TaskTrakerServerApplicationTests.java
@@ -1,10 +1,10 @@
-package com.Samsung.TaskTracker_Server;
+package com.Samsung.TaskTraker_Server;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
 @SpringBootTest
-class TaskTrackerServerApplicationTests {
+class TaskTrakerServerApplicationTests {
 
 	@Test
 	void contextLoads() {