diff --git a/webapp/WEB-INF/pages/logout.jsp b/webapp/WEB-INF/pages/logout.jsp
index e33a9a400..f55c73a8e 100644
--- a/webapp/WEB-INF/pages/logout.jsp
+++ b/webapp/WEB-INF/pages/logout.jsp
@@ -49,7 +49,7 @@
             </c:if>
             You have logged out successfully
             <hr/>
-            Click here to <a href="<c:url value="login.do" />" > Login</a>
+            Click here to <a href="<c:url value="login.mvc" />" > Login</a>
 
         </div> <!-- /container -->
 
diff --git a/webapp/WEB-INF/web.xml b/webapp/WEB-INF/web.xml
index 187dc83a8..70357eb93 100644
--- a/webapp/WEB-INF/web.xml
+++ b/webapp/WEB-INF/web.xml
@@ -256,7 +256,7 @@
 
          will be mapped to the "graph" servlet, while a request like:
 
-           http://localhost:8080/{contextpath}/saveCustomer.do
+           http://localhost:8080/{contextpath}/saveCustomer.mvc
 
          will be mapped to the "controller" servlet.
 
@@ -330,7 +330,7 @@
     </mime-mapping>
     
     <welcome-file-list>
-        <welcome-file>login.do</welcome-file>
+        <welcome-file>login.mvc</welcome-file>
     </welcome-file-list>
 
 	<!-- Define reference to the user database for looking up roles -->