diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8e46ce9..ffa6d7b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -20,7 +20,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausMvcController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/KlausMvcController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/main/java/com/release11/klaus/controller/KlausMvcController.java b/src/main/java/com/release11/klaus/controller/KlausMvcController.java
index cbd6c77..27e802f 100644
--- a/src/main/java/com/release11/klaus/controller/KlausMvcController.java
+++ b/src/main/java/com/release11/klaus/controller/KlausMvcController.java
@@ -21,7 +21,7 @@ import java.time.LocalDateTime;
 import java.util.*;
 
 /**
- * Sending GET request to path /home sets up a new UUID ex. 58b9709d-358b-4713-8fbc-6acf89e81418
+ * Sending GET request to path /mock sets up a new UUID ex. 58b9709d-358b-4713-8fbc-6acf89e81418
  * UUID is something like session id type which contains references to each saved message
  * Next saved massage shares UUID but its id is a +1 ex.
  * 58b9709d-358b-4713-8fbc-6acf89e81418/1; 58b9709d-358b-4713-8fbc-6acf89e81418/2 etc.
@@ -36,7 +36,7 @@ public class KlausMvcController {
     private final Set<MockedMessageDto> globalMockedMessageDtoList = new HashSet<>();
 
     @SneakyThrows
-    @GetMapping({"/home", "/home/{uuid}"})
+    @GetMapping({"/mock", "/mock/{uuid}"})
     public String showHome(final MockedMessageDto mockedMessageDto, final Model model,
                            @RequestParam(required = false) UUID clientUUID,
                            @PathVariable(required = false) UUID uuid) {
@@ -47,7 +47,7 @@ public class KlausMvcController {
         return "index";
     }
 
-    @PostMapping("/home/{uuid}")
+    @PostMapping("/mock/{uuid}")
     public String showHomePost(@Valid MockedMessageDto mockedMessageDto, BindingResult bindingResult, Model model) {
         TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "setMockedResponse",
                 BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()),
@@ -63,7 +63,7 @@ public class KlausMvcController {
         return "index";
     }
 
-    @PostMapping(value="/home/{uuid}", params={"newMessage"})
+    @PostMapping(value="/mock/{uuid}", params={"newMessage"})
     public String newMessage(Model model, @RequestParam UUID clientUUID) {
         MockedMessageDto mockedMessageDto = new MockedMessageDto(clientUUID, new LinkedHashMap<>());
         populateModelVars(model, mockedMessageDto, true);
@@ -71,7 +71,7 @@ public class KlausMvcController {
         return "index";
     }
 
-    @GetMapping("/home/getMockedResponse")
+    @GetMapping("/mock/getMockedResponse")
     @ResponseBody
     public String showGetMockedResponse(MockedMessageDto mockedMessageDto) throws JsonProcessingException {
         TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "getMockedResponse",
@@ -81,7 +81,7 @@ public class KlausMvcController {
                 mockedMessageDto.getMockedResponseId()).toString();
     }
 
-    @PostMapping(value = "/home/{uuid}", params = {"addHeader"} )
+    @PostMapping(value = "/mock/{uuid}", params = {"addHeader"} )
     public String addHeader(MockedMessageDto mockedMessageDto, @RequestParam String headerKey,
                          @RequestParam String headerValue, final Model model) {
         populateModelVars(model, mockedMessageDto,false);
@@ -89,14 +89,14 @@ public class KlausMvcController {
         return "index";
     }
 
-    @PostMapping(value="/home/{uuid}", params={"removeHeader"})
+    @PostMapping(value="/mock/{uuid}", params={"removeHeader"})
     public String removeHeader(MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) {
         populateModelVars(model, mockedMessageDto,false);
         mockedMessageDto.getHttpHeaders().remove(req.getParameter("removeHeader"));
         return "index";
     }
 
-    @PostMapping(value="/home/{uuid}", params={"updateMessage"})
+    @PostMapping(value="/mock/{uuid}", params={"updateMessage"})
     public String updateMessage(final HttpServletRequest req, MockedMessageDto mockedMessageDto, final Model model) {
         populateModelVars(model, mockedMessageDto, false);
         model.addAttribute("mockedMessageDto", klausService.getMockedResponse(mockedMessageDto.getClientUUID(),
@@ -105,7 +105,7 @@ public class KlausMvcController {
         return "index";
     }
 
-    @PostMapping(value="/home/{uuid}", params={"removeMessage"})
+    @PostMapping(value="/mock/{uuid}", params={"removeMessage"})
     public String removeMessage(MockedMessageDto mockedMessageDto, final HttpServletRequest req, final Model model) {
         TrackingClient.setBusinessKeys(Map.of(BusinessKey.INTERFACE_NAME, "deleteMockedResponse",
                 BusinessKey.CLIENT_UUID, String.valueOf(mockedMessageDto.getClientUUID()),
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 21bcde6..174f886 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -35,7 +35,7 @@
 
                             <table>
                                 <p>In order to change mockup response settings please fill the form below and save.</p>
-                                <form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}"
+                                <form action="#" th:action="@{/mock/__${mockedMessageDto.clientUUID}__}"
                                       th:object="${mockedMessageDto}" method="post">
                                     <input type="text" th:field="*{clientUUID}" hidden/>
                                     <tr>
@@ -160,7 +160,7 @@
                 <div id="list-wrapper" style="display: none;">
                     <p>Here you can see the interactive list of all your mocked messages. You can call all of them. Use
                         the buttons to sort the list and also update or delete messages.</p>
-                    <form action="#" th:action="@{/home/__${mockedMessageDto.clientUUID}__}"
+                    <form action="#" th:action="@{/mock/__${mockedMessageDto.clientUUID}__}"
                           th:object="${mockedMessageDto}" method="post">
                         <table>
                             <thead>
diff --git a/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java b/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java
index e82c5fc..a721c8e 100644
--- a/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java
+++ b/src/test/java/com/release11/klaus/controller/KlausMvcControllerTest.java
@@ -59,7 +59,7 @@ class KlausMvcControllerTest {
         when(klausService.getAllMockedResponses(any()))
                 .thenReturn(mockedMessageDtoList);
 
-        mockMvc.perform(get("/home/" + uuid))
+        mockMvc.perform(get("/mock/" + uuid))
                 .andExpect(status().isOk())
                 .andExpect(view().name("index"))
                 .andExpect(model().attributeExists("mockedMessageDtoList"));
@@ -69,7 +69,7 @@ class KlausMvcControllerTest {
 
     @Test
     void showHomePost() throws Exception {
-        mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
+        mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
                     .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
                     .param("mockedResponseId", "323")
                     .param("mediaType", "application/json")
@@ -84,7 +84,7 @@ class KlausMvcControllerTest {
 
     @Test
     void showHomePostNotValid() throws Exception {
-//        mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
+//        mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
 //                .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
 //                .param("mockedResponseId", "aaaa")
 //                .param("mediaType", "application/json")
@@ -101,7 +101,7 @@ class KlausMvcControllerTest {
         when(klausService.getAllMockedResponses(any()))
                 .thenReturn(mockedMessageDtoList);
 
-        mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
+        mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
                     .param("newMessage", "newMessage")
                     .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6"))
                 .andExpect(status().isOk())
@@ -116,7 +116,7 @@ class KlausMvcControllerTest {
         when(klausService.getMockedResponse(any(), anyInt()))
                 .thenReturn(mockedMessageDto);
 
-        mockMvc.perform(get("/home/getMockedResponse")
+        mockMvc.perform(get("/mock/getMockedResponse")
                 .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
                 .param("mockedResponseId", "323")
                 .param("mediaType", "application/json")
@@ -132,7 +132,7 @@ class KlausMvcControllerTest {
 //        when(klausService.getAllMockedResponses(any()))
 //                .thenReturn(mockedMessageDtoList);
 //
-//        mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
+//        mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
 //                .param("addHeader", "addHeader")
 //                .param("headerKey", "myKey")
 //                .param("headerValue", "myValue")
@@ -149,7 +149,7 @@ class KlausMvcControllerTest {
 //        when(klausService.getAllMockedResponses(any()))
 //                .thenReturn(mockedMessageDtoList);
 //
-//        mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
+//        mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
 //                .param("removeHeader", "removeHeader")
 //                .param("clientUUID", "e9dc0ad9-acd2-4699-99f7-368d53d7afd6"))
 //                .andExpect(status().isOk())
@@ -166,7 +166,7 @@ class KlausMvcControllerTest {
         when(klausService.getMockedResponse(any(), anyInt())).
                 thenReturn(mockedMessageDto);
 
-        mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
+        mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
                 .param("updateMessage", "323"))
                 .andExpect(status().isOk())
                 .andExpect(view().name("index"))
@@ -182,7 +182,7 @@ class KlausMvcControllerTest {
         when(klausService.getAllMockedResponses(any()))
                 .thenReturn(mockedMessageDtoList);
 
-        mockMvc.perform(post("/home/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
+        mockMvc.perform(post("/mock/e9dc0ad9-acd2-4699-99f7-368d53d7afd6")
                 .param("removeMessage", "323"))
                 .andExpect(status().isOk())
                 .andExpect(view().name("index"))