diff --git a/apimanager/apimanager/urls.py b/apimanager/apimanager/urls.py
index d5c3e70..34dedff 100644
--- a/apimanager/apimanager/urls.py
+++ b/apimanager/apimanager/urls.py
@@ -38,8 +38,8 @@ urlpatterns += i18n_patterns(
     url(r'^entitlementrequests/', include('entitlementrequests.urls')),
     url(r'^users/', include('users.urls')),
     url(r'^branches/', include('branches.urls')),
-    url(r'^atms/list', include('atms.urls')),
-    url(r'^atms/detail/id', include('atmdetail.urls')),
+    url(r'^atms/create', include('atms.urls')),
+    url(r'^atms/list', include('atmdetail.urls')),
     url(r'^customers/', include('customers.urls')),
     url(r'^metrics/', include('metrics.urls')),
     url(r'^config/', include('config.urls')),
diff --git a/apimanager/atmdetail/templates/atmsView/atmdetail.html b/apimanager/atmdetail/templates/atmsView/atmlist.html
similarity index 96%
rename from apimanager/atmdetail/templates/atmsView/atmdetail.html
rename to apimanager/atmdetail/templates/atmsView/atmlist.html
index fe332f7..16902f7 100644
--- a/apimanager/atmdetail/templates/atmsView/atmdetail.html
+++ b/apimanager/atmdetail/templates/atmsView/atmlist.html
@@ -1,7 +1,7 @@
 {% extends 'base.html' %} {% load static %} {% load i18n %}
 {% block page_title %} {{ block.super }} / {% trans "ATMs Detail" %}{% endblock page_title %} {% block content %}
 <div id="atms">
-    <h1>{% trans "ATMs List" %}</h1>
+    <h1>{% trans "ATM List" %}</h1>
     <form class="form-inline" method="get">
         <input type="submit" class="btn btn-default" value ='{% trans "Export CSV" %}' onclick="javascript: form.action='{% url 'export-csv' %}';">
     </form>
diff --git a/apimanager/atmdetail/urls.py b/apimanager/atmdetail/urls.py
index 3768860..7a1aad4 100644
--- a/apimanager/atmdetail/urls.py
+++ b/apimanager/atmdetail/urls.py
@@ -9,7 +9,7 @@ from .views import AtmListView, ExportCsvView
 urlpatterns = [
     url(r'^$',
         AtmListView.as_view(),
-        name='atm-detail'),
+        name='atm-list'),
     url(r'^export_csv$',
             ExportCsvView.as_view(),
             name='export-csv')
diff --git a/apimanager/atmdetail/views.py b/apimanager/atmdetail/views.py
index a91db9a..12a8d40 100644
--- a/apimanager/atmdetail/views.py
+++ b/apimanager/atmdetail/views.py
@@ -19,7 +19,7 @@ import csv
 
 
 class AtmListView(IndexAtmsView, LoginRequiredMixin, FormView ):
-    template_name = "atmsView/atmdetail.html"
+    template_name = "atmsView/atmlist.html"
     success_url = '/atmsView/'
     def get_banks(self):
                 api = API(self.request.session.get('obp'))
diff --git a/apimanager/atms/templates/atms/index.html b/apimanager/atms/templates/atms/index.html
index 92f926e..9d9ad11 100644
--- a/apimanager/atms/templates/atms/index.html
+++ b/apimanager/atms/templates/atms/index.html
@@ -1,6 +1,6 @@
 {% extends 'base.html' %} {% load static %} {% load i18n %}  {% block page_title %}{{ block.super }} / Atms{% endblock page_title %} {% block content %}
 <div id="atms_list">
-  <h1>{% trans "ATM Detail" %}</h1>
+  <h1>{% trans "ATM Create" %}</h1>
 
   <form method="post">
     {% csrf_token %} {% if form.non_field_errors %}
diff --git a/apimanager/atms/urls.py b/apimanager/atms/urls.py
index f4520cd..b407375 100644
--- a/apimanager/atms/urls.py
+++ b/apimanager/atms/urls.py
@@ -9,7 +9,7 @@ from .views import IndexAtmsView, UpdateAtmsView
 urlpatterns = [
     url(r'^$',
         IndexAtmsView.as_view(),
-        name='atms_list'),
+        name='atms_create'),
     url(r'^update/(?P<atm_id>[ 0-9\w|\W\@\.\+-]+)/bank/(?P<bank_id>[0-9\w\@\.\+-]+)/$',
         UpdateAtmsView.as_view(),
         name='atms_update'),
diff --git a/apimanager/atms/views.py b/apimanager/atms/views.py
index 24555c7..026146e 100644
--- a/apimanager/atms/views.py
+++ b/apimanager/atms/views.py
@@ -182,7 +182,7 @@ class IndexAtmsView(LoginRequiredMixin, FormView):
 
 class UpdateAtmsView(LoginRequiredMixin, FormView):
     template_name = "atms/update.html"
-    success_url = '/atms/'
+    success_url = '/atms/list'
     form_class = CreateAtmForm
 
     def dispatch(self, request, *args, **kwargs):
diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html
index ca547a1..bc465d4 100644
--- a/apimanager/base/templates/base.html
+++ b/apimanager/base/templates/base.html
@@ -74,15 +74,15 @@
 				</li>
 				{% url "branches_list" as branches_list_url %}
 				{% url "customers-create" as customers_create_url %}
-				{% url "atms_list" as atms_list_url %}
-				{% url "atm-detail" as atm_detail_url %}
+				{% url "atms_create" as atms_create_url %}
+				{% url "atm-list" as atm_list_url %}
 				<li class="dropdown{% if customers_create_url in request.path %} active{% endif %}">
 					<a href="#" data-toggle="dropdown" class="dropdown-toggle">{% trans "Resources" %}</a>
 					<ul class="dropdown-menu">
 						<li {% if customers_create_url in request.path  %} class="active"{% endif %}><a href="{{ customers_create_url }}">{% trans "Customers" %}</a></li><hr class="dropdown-hr">
 						<li {% if branches_list_url in request.path  %} class="active"{% endif %}><a href="{{ branches_list_url }}">{% trans "Branches" %}</a></li>
-						<li {% if atms_list_url in request.path  %} class="active"{% endif %}><a href="{{ atms_list_url }}">{% trans "ATMs" %}</a></li>
-						<li {% if atm_detail_url in request.path  %} class="active"{% endif %}><a href="{{ atm_detail_url }}">{% trans "ATMs Detail" %}</a></li>
+						<li {% if atms_create_url in request.path  %} class="active"{% endif %}><a href="{{ atms_create_url }}">{% trans "ATM Create" %}</a></li>
+						<li {% if atm_list_url in request.path  %} class="active"{% endif %}><a href="{{ atm_list_url }}">{% trans "ATM List" %}</a></li>
 					</ul>
 				</li>
 				{% url "config-index" as config_index_url %}