diff --git a/README.md b/README.md
index 2b16faffd90fa168d3de7d93b255daf7fc1bf08f..1f49835446692ef9f8ed4d39349f5f4b9cda3074 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Tugas 3 IF3110 Pengembangan Aplikasi Berbasis Web
 
-Melakukan upgrade Website ojek online sederhana pada Tugas 2 dengan mengaplikasikan ***cloud service* (Firebase Cloud Messaging) dan *framework* MEAN stack**.
+Melakukan upgrade Website ojek online sederhana pada Tugas 2 dengan mengaplikasikan *cloud service* (Firebase Cloud Messaging) dan *framework* MEAN stack**.
 
 **Luangkan waktu untuk membaca spek ini sampai selesai. Kerjakan hal yang perlu saja.**
 
diff --git a/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/ChatDriverServlet.java b/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/ChatServlet.java
similarity index 92%
rename from TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/ChatDriverServlet.java
rename to TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/ChatServlet.java
index e0f9792716c6f1df20b548d7e5959198be11f238..5abe868f4b015695542e51a7715c175580e5a01b 100644
--- a/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/ChatDriverServlet.java
+++ b/TugasBesar2_2017/WebApp/src/main/java/com/adaapa/adaojek/servlets/ChatServlet.java
@@ -17,7 +17,7 @@ import java.io.IOException;
 /**
  * Created by ireneedriadr on 11/21/17.
  */
-public class ChatDriverServlet extends HttpServlet {
+public class ChatServlet extends HttpServlet {
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp)
             throws ServletException, IOException {
@@ -37,7 +37,7 @@ public class ChatDriverServlet extends HttpServlet {
             } else {
                 UserBean ubean = gson.fromJson(wsBean.getBody(), UserBean.class);
                 req.setAttribute("driverProfile", ubean);
-                req.getRequestDispatcher("WEB-INF/chat_driver.jsp").forward(req, resp);
+                req.getRequestDispatcher("WEB-INF/chat.jsp").forward(req, resp);
             }
         }
     }
diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/chat_driver.jsp b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/chat.jsp
similarity index 100%
rename from TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/chat_driver.jsp
rename to TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/chat.jsp
diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/find_driver.jsp b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/find_driver.jsp
index 8c7e57443a3f67a204c5c86963487ba8b4d50724..d6a9a3a0619ca7694fbe5397d07df70df6261b46 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/find_driver.jsp
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/find_driver.jsp
@@ -32,7 +32,7 @@
                 </li>
             </ul>
         </div>
-        <form action="chat_driver" method="get">
+        <form action="chat" method="get">
             <input type="hidden" name="pickUp" value="${pickup}">
             <input type="hidden" name="destination" value="${destination}">
             <div class="order-panel">
@@ -126,4 +126,4 @@
 <%@ include file="/component/footer.html" %>
 <script>
     window.onload = toggleActive("nav-order");
-</script>
\ No newline at end of file
+</script>
diff --git a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/web.xml b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/web.xml
index 779aee43caa75d8d7f01f49a98d764a6c83f94f0..6a48b22ded6d95a41753b3e1ecd739960da7fc61 100644
--- a/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/web.xml
+++ b/TugasBesar2_2017/WebApp/src/main/webapp/WEB-INF/web.xml
@@ -76,12 +76,12 @@
     </servlet-mapping>
 
     <servlet>
-        <servlet-name>ChatDriver</servlet-name>
-        <servlet-class>com.adaapa.adaojek.servlets.ChatDriverServlet</servlet-class>
+        <servlet-name>Chat</servlet-name>
+        <servlet-class>com.adaapa.adaojek.servlets.ChatServlet</servlet-class>
     </servlet>
     <servlet-mapping>
-        <servlet-name>ChatDriver</servlet-name>
-        <url-pattern>/chat_driver</url-pattern>
+        <servlet-name>Chat</servlet-name>
+        <url-pattern>/chat</url-pattern>
     </servlet-mapping>
 
     <servlet>