diff --git a/django-openstack/django_openstack/dash/views/containers.py b/django-openstack/django_openstack/dash/views/containers.py
index ee4e48c627..498c2b70b6 100644
--- a/django-openstack/django_openstack/dash/views/containers.py
+++ b/django-openstack/django_openstack/dash/views/containers.py
@@ -74,7 +74,7 @@ def index(request, tenant_id):
     containers = api.swift_get_containers(request)
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/containers/dash_containers.html', {
+    'django_openstack/dash/containers/index.html', {
         'containers': containers,
         'delete_form': delete_form,
     }, context_instance=template.RequestContext(request))
@@ -87,6 +87,6 @@ def create(request, tenant_id):
         return handled
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/containers/dash_containers_create.html', {
+    'django_openstack/dash/containers/create.html', {
         'create_form': form,
     }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/dash/views/floating_ips.py b/django-openstack/django_openstack/dash/views/floating_ips.py
index 2a77a9ee92..e46f31a0fa 100644
--- a/django-openstack/django_openstack/dash/views/floating_ips.py
+++ b/django-openstack/django_openstack/dash/views/floating_ips.py
@@ -137,7 +137,7 @@ def index(request, tenant_id):
         messages.error(request, 'Error fetching floating ips: %s' % e.message)
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/floating_ips/dash_floating_ips.html', {
+    'django_openstack/dash/floating_ips/index.html', {
         'allocate_form': FloatingIpAllocate(initial={
                                             'tenant_id': request.user.tenant}),
         'disassociate_form': FloatingIpDisassociate(),
@@ -160,7 +160,7 @@ def associate(request, tenant_id, ip_id):
         return handled
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/floating_ips/dash_floating_ips_associate.html', {
+    'django_openstack/dash/floating_ips/associate.html', {
         'associate_form': form,
     }, context_instance=template.RequestContext(request))
 
@@ -172,5 +172,5 @@ def disassociate(request, tenant_id, ip_id):
         return handled
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/floating_ips/dash_floating_ips_associate.html', {
+    'django_openstack/dash/floating_ips/associate.html', {
     }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/dash/views/images.py b/django-openstack/django_openstack/dash/views/images.py
index 5874c3db6d..3fc7cb3310 100644
--- a/django-openstack/django_openstack/dash/views/images.py
+++ b/django-openstack/django_openstack/dash/views/images.py
@@ -143,7 +143,7 @@ def index(request, tenant_id):
               if im['container_format'] not in ['aki', 'ari']]
 
     return render_to_response(
-    'django_openstack/dash/images/dash_images.html', {
+    'django_openstack/dash/images/index.html', {
         'tenant': tenant,
         'images': images,
     }, context_instance=template.RequestContext(request))
@@ -204,7 +204,7 @@ def launch(request, tenant_id, image_id):
         return handled
 
     return render_to_response(
-    'django_openstack/dash/images/dash_launch.html', {
+    'django_openstack/dash/images/launch.html', {
         'tenant': tenant,
         'image': image,
         'form': form,
diff --git a/django-openstack/django_openstack/dash/views/instances.py b/django-openstack/django_openstack/dash/views/instances.py
index ec8964aab8..1d24284f35 100644
--- a/django-openstack/django_openstack/dash/views/instances.py
+++ b/django-openstack/django_openstack/dash/views/instances.py
@@ -129,7 +129,7 @@ def index(request, tenant_id):
     reboot_form = RebootInstance()
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/instances/dash_instances.html', {
+    'django_openstack/dash/instances/index.html', {
         'instances': instances,
         'terminate_form': terminate_form,
         'reboot_form': reboot_form,
@@ -203,10 +203,10 @@ def usage(request, tenant_id=None):
         instances += terminated_instances
 
     if request.GET.get('format', 'html') == 'csv':
-        template_name = 'django_openstack/dash/instances/dash_usage.csv'
+        template_name = 'django_openstack/dash/instances/usage.csv'
         mimetype = "text/csv"
     else:
-        template_name = 'django_openstack/dash/instances/dash_usage.html'
+        template_name = 'django_openstack/dash/instances/usage.html'
         mimetype = "text/html"
 
     return shortcuts.render_to_response(template_name, {
@@ -280,7 +280,7 @@ def update(request, tenant_id, instance_id):
         return handled
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/instances/dash_instance_update.html', {
+    'django_openstack/dash/instances/update.html', {
         'instance': instance,
         'form': form,
     }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/dash/views/keypairs.py b/django-openstack/django_openstack/dash/views/keypairs.py
index 36ac9f0fb6..37f8820db3 100644
--- a/django-openstack/django_openstack/dash/views/keypairs.py
+++ b/django-openstack/django_openstack/dash/views/keypairs.py
@@ -88,7 +88,7 @@ def index(request, tenant_id):
         messages.error(request, 'Error fetching keypairs: %s' % e.message)
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/keypairs/dash_keypairs.html', {
+    'django_openstack/dash/keypairs/index.html', {
         'keypairs': keypairs,
         'delete_form': delete_form,
     }, context_instance=template.RequestContext(request))
@@ -101,6 +101,6 @@ def create(request, tenant_id):
         return handled
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/keypairs/dash_keypairs_create.html', {
+    'django_openstack/dash/keypairs/create.html', {
         'create_form': form,
     }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/dash/views/networks.py b/django-openstack/django_openstack/dash/views/networks.py
index 217d803633..96c3493c0b 100644
--- a/django-openstack/django_openstack/dash/views/networks.py
+++ b/django-openstack/django_openstack/dash/views/networks.py
@@ -137,7 +137,7 @@ def index(request, tenant_id):
         messages.error(request, 'Unable to get network list: %s' % e.message)
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/networks/dash_networks.html', {
+    'django_openstack/dash/networks/index.html', {
         'networks': networks,
         'delete_form': delete_form,
     }, context_instance=template.RequestContext(request))
@@ -150,7 +150,7 @@ def create(request, tenant_id):
         return shortcuts.redirect('dash_networks', request.user.tenant)
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/networks/dash_network_create.html', {
+    'django_openstack/dash/networks/create.html', {
         'network_form': network_form
     }, context_instance=template.RequestContext(request))
 
@@ -172,7 +172,7 @@ def detail(request, tenant_id, network_id):
         messages.error(request, 'Unable to get network details:%s' % e.message)
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/networks/dash_networks_detail.html', {
+    'django_openstack/dash/networks/detail.html', {
         'network': network,
         'tenant': tenant_id,
         'delete_port_form': delete_port_form,
@@ -190,7 +190,7 @@ def rename(request, tenant_id, network_id):
         return shortcuts.redirect('dash_networks', request.user.tenant)
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/networks/dash_network_rename.html', {
+    'django_openstack/dash/networks/rename.html', {
         'network': network_details,
         'rename_form': rename_form
     }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/dash/views/objects.py b/django-openstack/django_openstack/dash/views/objects.py
index 89d04f3430..4f83210b1a 100644
--- a/django-openstack/django_openstack/dash/views/objects.py
+++ b/django-openstack/django_openstack/dash/views/objects.py
@@ -134,7 +134,7 @@ def index(request, tenant_id, container_name):
 
     delete_form.fields['container_name'].initial = container_name
     return render_to_response(
-    'django_openstack/dash/objects/dash_objects.html', {
+    'django_openstack/dash/objects/index.html', {
         'container_name': container_name,
         'objects': objects,
         'delete_form': delete_form,
@@ -150,7 +150,7 @@ def upload(request, tenant_id, container_name):
 
     form.fields['container_name'].initial = container_name
     return render_to_response(
-    'django_openstack/dash/objects/dash_objects_upload.html', {
+    'django_openstack/dash/objects/upload.html', {
         'container_name': container_name,
         'upload_form': form,
     }, context_instance=template.RequestContext(request))
@@ -185,7 +185,7 @@ def copy(request, tenant_id, container_name, object_name):
     form.fields['orig_object_name'].initial = object_name
 
     return render_to_response(
-        'django_openstack/dash/objects/dash_object_copy.html',
+        'django_openstack/dash/objects/copy.html',
         {'container_name': container_name,
          'object_name': object_name,
          'copy_form': form},
diff --git a/django-openstack/django_openstack/dash/views/ports.py b/django-openstack/django_openstack/dash/views/ports.py
index db5f20a537..bbfd092256 100644
--- a/django-openstack/django_openstack/dash/views/ports.py
+++ b/django-openstack/django_openstack/dash/views/ports.py
@@ -160,7 +160,7 @@ def create(request, tenant_id, network_id):
         )
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/ports/dash_ports_create.html', {
+    'django_openstack/dash/ports/create.html', {
         'network_id': network_id,
         'create_form': create_form
     }, context_instance=template.RequestContext(request))
@@ -178,7 +178,7 @@ def attach(request, tenant_id, network_id, port_id):
     vifs = _get_available_vifs(request)
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/ports/dash_port_attach.html', {
+    'django_openstack/dash/ports/attach.html', {
         'network': network_id,
         'port': port_id,
         'attach_form': attach_form,
diff --git a/django-openstack/django_openstack/dash/views/security_groups.py b/django-openstack/django_openstack/dash/views/security_groups.py
index 80718f5232..e88e3a5d2b 100644
--- a/django-openstack/django_openstack/dash/views/security_groups.py
+++ b/django-openstack/django_openstack/dash/views/security_groups.py
@@ -154,7 +154,7 @@ def index(request, tenant_id):
                                  % e.message)
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/security_groups/dash_security_groups.html', {
+    'django_openstack/dash/security_groups/index.html', {
         'security_groups': security_groups,
         'delete_form': delete_form,
     }, context_instance=template.RequestContext(request))
@@ -182,7 +182,7 @@ def edit_rules(request, tenant_id, security_group_id):
         return shortcuts.redirect('dash_security_groups', tenant_id)
 
     return shortcuts.render_to_response(
-        'django_openstack/dash/security_groups/dash_security_groups_edit_rules.html', {
+        'django_openstack/dash/security_groups/edit_rules.html', {
         'security_group': security_group,
         'delete_form': delete_form,
         'form': add_form,
@@ -197,6 +197,6 @@ def create(request, tenant_id):
         return handled
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/security_groups/dash_security_groups_create.html', {
+    'django_openstack/dash/security_groups/create.html', {
         'form': form,
     }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/dash/views/snapshots.py b/django-openstack/django_openstack/dash/views/snapshots.py
index cd82160f30..0a26c44791 100644
--- a/django-openstack/django_openstack/dash/views/snapshots.py
+++ b/django-openstack/django_openstack/dash/views/snapshots.py
@@ -84,7 +84,7 @@ def index(request, tenant_id):
         messages.error(request, msg)
 
     return render_to_response(
-    'django_openstack/dash/snapshots/dash_snapshots.html', {
+    'django_openstack/dash/snapshots/index.html', {
         'images': images,
     }, context_instance=template.RequestContext(request))
 
@@ -113,7 +113,7 @@ def create(request, tenant_id, instance_id):
         return shortcuts.redirect('dash_instances', tenant_id)
 
     return shortcuts.render_to_response(
-    'django_openstack/dash/snapshots/dash_snapshots_create.html', {
+    'django_openstack/dash/snapshots/create.html', {
         'instance': instance,
         'create_form': form,
     }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/syspanel/views/flavors.py b/django-openstack/django_openstack/syspanel/views/flavors.py
index 10445ea3d3..92382a1e05 100644
--- a/django-openstack/django_openstack/syspanel/views/flavors.py
+++ b/django-openstack/django_openstack/syspanel/views/flavors.py
@@ -95,7 +95,7 @@ def index(request):
 
     flavors.sort(key=lambda x: x.id, reverse=True)
     return render_to_response(
-    'django_openstack/syspanel/flavors/syspanel_flavors.html', {
+    'django_openstack/syspanel/flavors/index.html', {
         'delete_form': delete_form,
         'flavors': flavors,
     }, context_instance=template.RequestContext(request))
@@ -115,7 +115,7 @@ def create(request):
     global_summary.human_readable('ram_size')
 
     return render_to_response(
-    'django_openstack/syspanel/flavors/syspanel_create_flavor.html', {
+    'django_openstack/syspanel/flavors/create.html', {
         'global_summary': global_summary.summary,
         'form': form,
     }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/syspanel/views/images.py b/django-openstack/django_openstack/syspanel/views/images.py
index b4aa844fa6..0bb1d49ba5 100644
--- a/django-openstack/django_openstack/syspanel/views/images.py
+++ b/django-openstack/django_openstack/syspanel/views/images.py
@@ -111,7 +111,7 @@ def index(request):
         LOG.error("Error retrieving image list", exc_info=True)
         messages.error(request, "Error retrieving image list: %s" % e.message)
 
-    return render_to_response('django_openstack/syspanel/images/syspanel_images.html', {
+    return render_to_response('django_openstack/syspanel/images/index.html', {
         'delete_form': delete_form,
         'toggle_form': toggle_form,
         'images': images,
@@ -175,7 +175,7 @@ def update(request, image_id):
             messages.error(request,
                            "Image could not be uploaded, please try agian.")
             form = UpdateImageForm(request.POST)
-            return render_to_response('django_openstack/syspanel/images/syspanel_image_update.html', {
+            return render_to_response('django_openstack/syspanel/images/update.html', {
                 'image': image,
                 'form': form,
             }, context_instance=template.RequestContext(request))
@@ -193,7 +193,7 @@ def update(request, image_id):
                 'disk_format': image.get('disk_format', ''),
             })
 
-        return render_to_response('django_openstack/syspanel/images/syspanel_image_update.html', {
+        return render_to_response('django_openstack/syspanel/images/update.html', {
             'image': image,
             'form': form,
         }, context_instance=template.RequestContext(request))
@@ -235,7 +235,7 @@ def upload(request):
                            "Image could not be uploaded, please try agian.")
             form = UploadImageForm(request.POST)
             return render_to_response('django_nova_syspanel/images/'
-                'image_upload.html', {
+                'upload.html', {
                 'form': form,
             }, context_instance=template.RequestContext(request))
 
@@ -243,6 +243,6 @@ def upload(request):
     else:
         form = UploadImageForm()
         return render_to_response('django_nova_syspanel/images/'
-            'image_upload.html', {
+            'upload.html', {
             'form': form,
         }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/syspanel/views/instances.py b/django-openstack/django_openstack/syspanel/views/instances.py
index 33f1822b3e..79b69be8a5 100644
--- a/django-openstack/django_openstack/syspanel/views/instances.py
+++ b/django-openstack/django_openstack/syspanel/views/instances.py
@@ -104,10 +104,10 @@ def usage(request):
     global_summary.human_readable('ram_size')
 
     if request.GET.get('format', 'html') == 'csv':
-        template_name = 'django_openstack/syspanel/instances/syspanel_usage.csv'
+        template_name = 'django_openstack/syspanel/instances/usage.csv'
         mimetype = "text/csv"
     else:
-        template_name = 'django_openstack/syspanel/instances/syspanel_usage.html'
+        template_name = 'django_openstack/syspanel/instances/usage.html'
         mimetype = "text/html"
 
     return render_to_response(
@@ -159,10 +159,10 @@ def tenant_usage(request, tenant_id):
                 running_instances.append(i)
 
     if request.GET.get('format', 'html') == 'csv':
-        template_name = 'django_openstack/syspanel/instances/syspanel_tenant_usage.csv'
+        template_name = 'django_openstack/syspanel/instances/tenant_usage.csv'
         mimetype = "text/csv"
     else:
-        template_name = 'django_openstack/syspanel/instances/syspanel_tenant_usage.html'
+        template_name = 'django_openstack/syspanel/instances/tenant_usage.html'
         mimetype = "text/html"
 
     return render_to_response(template_name, {
@@ -197,7 +197,7 @@ def index(request):
     reboot_form = RebootInstance()
 
     return render_to_response(
-    'django_openstack/syspanel/instances/syspanel_instances.html', {
+    'django_openstack/syspanel/instances/index.html', {
         'instances': instances,
         'terminate_form': terminate_form,
         'reboot_form': reboot_form,
@@ -224,7 +224,7 @@ def refresh(request):
     reboot_form = RebootInstance()
 
     return render_to_response(
-    'django_openstack/syspanel/instances/_syspanel_instance_list.html', {
+    'django_openstack/syspanel/instances/_list.html', {
         'instances': instances,
         'terminate_form': terminate_form,
         'reboot_form': reboot_form,
diff --git a/django-openstack/django_openstack/syspanel/views/quotas.py b/django-openstack/django_openstack/syspanel/views/quotas.py
index 8211136baf..53155f09cf 100644
--- a/django-openstack/django_openstack/syspanel/views/quotas.py
+++ b/django-openstack/django_openstack/syspanel/views/quotas.py
@@ -25,6 +25,6 @@ def index(request):
     quotas.pop('id')
 
     return render_to_response(
-    'django_openstack/syspanel/quotas/syspanel_quotas.html', {
+    'django_openstack/syspanel/quotas/index.html', {
         'quotas': quotas,
     }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/syspanel/views/services.py b/django-openstack/django_openstack/syspanel/views/services.py
index 9b95c131b6..61b73f5081 100644
--- a/django-openstack/django_openstack/syspanel/views/services.py
+++ b/django-openstack/django_openstack/syspanel/views/services.py
@@ -109,7 +109,7 @@ def index(request):
                                                              svc['host']))
 
     return render_to_response(
-    'django_openstack/syspanel/services/syspanel_services.html', {
+    'django_openstack/syspanel/services/index.html', {
         'services': services,
         'service_toggle_enabled_form': ToggleService,
         'other_services': other_services,
diff --git a/django-openstack/django_openstack/syspanel/views/tenants.py b/django-openstack/django_openstack/syspanel/views/tenants.py
index c6beb3df6d..b516f4da94 100644
--- a/django-openstack/django_openstack/syspanel/views/tenants.py
+++ b/django-openstack/django_openstack/syspanel/views/tenants.py
@@ -179,7 +179,7 @@ def index(request):
         messages.error(request, 'Unable to get tenant info: %s' % e.message)
     tenants.sort(key=lambda x: x.id, reverse=True)
     return render_to_response(
-    'django_openstack/syspanel/tenants/syspanel_tenants.html', {
+    'django_openstack/syspanel/tenants/index.html', {
         'tenants': tenants,
     }, context_instance=template.RequestContext(request))
 
@@ -192,7 +192,7 @@ def create(request):
         return handled
 
     return render_to_response(
-    'django_openstack/syspanel/tenants/syspanel_tenant_create.html', {
+    'django_openstack/syspanel/tenants/create.html', {
         'form': form,
     }, context_instance=template.RequestContext(request))
 
@@ -217,7 +217,7 @@ def update(request, tenant_id):
             return redirect('syspanel_tenants')
 
     return render_to_response(
-    'django_openstack/syspanel/tenants/syspanel_tenant_update.html', {
+    'django_openstack/syspanel/tenants/update.html', {
         'form': form,
     }, context_instance=template.RequestContext(request))
 
@@ -247,7 +247,7 @@ def users(request, tenant_id):
         if i in new_user_ids:
             new_user_ids.remove(i)
     return render_to_response(
-    'django_openstack/syspanel/tenants/syspanel_tenant_users.html', {
+    'django_openstack/syspanel/tenants/users.html', {
         'add_user_form': add_user_form,
         'remove_user_form': remove_user_form,
         'tenant_id': tenant_id,
@@ -280,7 +280,7 @@ def quotas(request, tenant_id):
     form = UpdateQuotas(initial=quota_set)
 
     return render_to_response(
-    'django_openstack/syspanel/tenants/syspanel_tenant_quotas.html', {
+    'django_openstack/syspanel/tenants/quotas.html', {
         'form': form,
         'tenant_id': tenant_id,
         'quotas': quotas,
diff --git a/django-openstack/django_openstack/syspanel/views/users.py b/django-openstack/django_openstack/syspanel/views/users.py
index b84c1adf1c..45fc9665f6 100644
--- a/django-openstack/django_openstack/syspanel/views/users.py
+++ b/django-openstack/django_openstack/syspanel/views/users.py
@@ -111,7 +111,7 @@ def index(request):
     user_delete_form = UserDeleteForm()
     user_enable_disable_form = UserEnableDisableForm()
 
-    return shortcuts.render_to_response('django_openstack/syspanel/users/syspanel_users.html', {
+    return shortcuts.render_to_response('django_openstack/syspanel/users/index.html', {
         'users': users,
         'user_delete_form': user_delete_form,
         'user_enable_disable_form': user_enable_disable_form,
@@ -146,7 +146,7 @@ def update(request, user_id):
                                     please try again.')
 
             return render_to_response(
-            'django_openstack/syspanel/users/syspanel_user_update.html', {
+            'django_openstack/syspanel/users/update.html', {
                 'form': form,
                 'user_id': user_id,
             }, context_instance=template.RequestContext(request))
@@ -169,7 +169,7 @@ def update(request, user_id):
                                  'email': email},
                                  tenant_list=tenants)
         return render_to_response(
-        'django_openstack/syspanel/users/syspanel_user_update.html', {
+        'django_openstack/syspanel/users/update.html', {
             'form': form,
             'user_id': user_id,
         }, context_instance=template.RequestContext(request))
@@ -218,13 +218,13 @@ def create(request):
                 return redirect('syspanel_users')
         else:
             return render_to_response(
-            'django_openstack/syspanel/users/syspanel_user_create.html', {
+            'django_openstack/syspanel/users/create.html', {
                 'form': form,
             }, context_instance=template.RequestContext(request))
 
     else:
         form = UserForm(tenant_list=tenants)
         return render_to_response(
-        'django_openstack/syspanel/users/syspanel_user_create.html', {
+        'django_openstack/syspanel/users/create.html', {
             'form': form,
         }, context_instance=template.RequestContext(request))
diff --git a/django-openstack/django_openstack/templates/django_openstack/_messages.html b/django-openstack/django_openstack/templates/django_openstack/_messages.html
deleted file mode 100644
index 8cead94b11..0000000000
--- a/django-openstack/django_openstack/templates/django_openstack/_messages.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% for message in messages %}
-  <div class="message ui-widget">
-  {% if message.tags == "info" %}
-    <div class="ui-state-highlight ui-corner-all">
-      <span class="close ui-icon ui-icon-circle-close"></span>
-      <p>
-        <span class="ui-icon ui-icon-info"></span>
-        {{ message }}
-      </p>
-    </div>
-  {% endif %}
-  {% if message.tags == "warning" %}
-    <div class="ui-state-highlight ui-corner-all" >
-      <span class="close ui-icon ui-icon-circle-close"></span>
-      <p>
-        <span class="ui-icon ui-icon-alert"></span>
-        {{ message }}
-      </p>
-    </div>
-  {% endif %}
-  {% if message.tags == "success" %}
-    <div class="ui-state-highlight ui-corner-all success" >
-     <span class="close ui-icon ui-icon-circle-close"></span>
-     <p>
-        <span class="ui-icon ui-icon-check"></span>
-        {{ message }}
-      </p>
-    </div>
-  {% endif %}
-  {% if message.tags == "error" %}
-    <div class="ui-state-error ui-corner-all" >
-      <span class="close ui-icon ui-icon-circle-close"></span>
-      <p>
-        <span class="ui-icon ui-icon-alert"></span>
-        {{ message }}
-      </p>
-    </div>
-  {% endif %}
-  </div>
-{% endfor %}
-
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/_dash_sidebar.html b/django-openstack/django_openstack/templates/django_openstack/dash/_sidebar.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/_dash_sidebar.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/_sidebar.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/dash_base.html b/django-openstack/django_openstack/templates/django_openstack/dash/base.html
similarity index 85%
rename from django-openstack/django_openstack/templates/django_openstack/dash/dash_base.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/base.html
index a2972a7e93..430a4d995c 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/dash_base.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/base.html
@@ -6,7 +6,7 @@
   {% endwith %}
 {% endblock %}
 {% block sidebar %}
-  {% include 'django_openstack/dash/_dash_sidebar.html' %}
+  {% include 'django_openstack/dash/_sidebar.html' %}
 {% endblock %}
 
 {% block main %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/containers/_delete_container.html b/django-openstack/django_openstack/templates/django_openstack/dash/containers/_delete.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/containers/_delete_container.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/containers/_delete.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/containers/_container_form.html b/django-openstack/django_openstack/templates/django_openstack/dash/containers/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/containers/_container_form.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/containers/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/containers/_container_list.html b/django-openstack/django_openstack/templates/django_openstack/dash/containers/_list.html
similarity index 90%
rename from django-openstack/django_openstack/templates/django_openstack/dash/containers/_container_list.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/containers/_list.html
index 86d6f75b01..86a81092d4 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/containers/_container_list.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/containers/_list.html
@@ -8,7 +8,7 @@
     <td>{{ container.name }}</td>
     <td id="actions">
       <ul>
-        <li class="form">{% include "django_openstack/dash/containers/_delete_container.html" with form=delete_form %}</li>
+        <li class="form">{% include "django_openstack/dash/containers/_delete.html" with form=delete_form %}</li>
         <li><a href="{% url dash_objects request.user.tenant container.name %}">List Objects</a></li>
         <li><a href="{% url dash_objects_upload request.user.tenant container.name %}">Upload Object</a></li>
       </ul>
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/containers/dash_containers_create.html b/django-openstack/django_openstack/templates/django_openstack/dash/containers/create.html
similarity index 86%
rename from django-openstack/django_openstack/templates/django_openstack/dash/containers/dash_containers_create.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/containers/create.html
index 8a3281f7fd..58627e4ddd 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/containers/dash_containers_create.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/containers/create.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="containers" %}
@@ -13,7 +13,7 @@
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/dash/containers/_container_form.html' with form=create_form %}
+      {% include 'django_openstack/dash/containers/_form.html' with form=create_form %}
     </div>
 
     <div class="right">
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/containers/dash_containers.html b/django-openstack/django_openstack/templates/django_openstack/dash/containers/index.html
similarity index 82%
rename from django-openstack/django_openstack/templates/django_openstack/dash/containers/dash_containers.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/containers/index.html
index 95b561b7c7..a0ad37439b 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/containers/dash_containers.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/containers/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="containers" %}
@@ -13,6 +13,6 @@
 {% endblock page_header %}
 
 {% block dash_main %}
-  {% include 'django_openstack/dash/containers/_container_list.html' %}
+  {% include 'django_openstack/dash/containers/_list.html' %}
   <a class="action_link large-rounded" href="{% url dash_containers_create request.user.tenant %}">Create New Container &gt;&gt;</a>
 {% endblock %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_allocate_floating_ip.html b/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_allocate.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_allocate_floating_ip.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_allocate.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_floating_ip_associate.html b/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_associate.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_floating_ip_associate.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_associate.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_disassociate_floating_ip.html b/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_disassociate.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_disassociate_floating_ip.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_disassociate.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_floating_ips_list.html b/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_list.html
similarity index 86%
rename from django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_floating_ips_list.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_list.html
index e033574669..1c4e83cb4a 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_floating_ips_list.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_list.html
@@ -22,9 +22,9 @@
 
     <td id="actions">
       <ul>
-        <li class="form">{% include "django_openstack/dash/floating_ips/_release_floating_ip.html" with form=release_form %}</li>
+        <li class="form">{% include "django_openstack/dash/floating_ips/_release.html" with form=release_form %}</li>
         {% if ip.fixed_ip %}
-        <li class="form">{% include "django_openstack/dash/floating_ips/_disassociate_floating_ip.html" with form=disassociate_form %}</li>
+        <li class="form">{% include "django_openstack/dash/floating_ips/_disassociate.html" with form=disassociate_form %}</li>
         {% else %}
           <li class="form"><a href="{% url dash_floating_ips_associate request.user.tenant ip.id %}">Associate to instance</a></li>
         {% endif %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_release_floating_ip.html b/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_release.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_release_floating_ip.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/_release.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/dash_floating_ips_associate.html b/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/associate.html
similarity index 78%
rename from django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/dash_floating_ips_associate.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/associate.html
index 122e59fcdd..0f8a77b2ec 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/dash_floating_ips_associate.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/associate.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="floatingips" %}
@@ -14,7 +14,7 @@
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/dash/floating_ips/_floating_ip_associate.html' with form=associate_form %}
+      {% include 'django_openstack/dash/floating_ips/_associate.html' with form=associate_form %}
     </div>
 
     <div class="right">
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/dash_floating_ips.html b/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/index.html
similarity index 73%
rename from django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/dash_floating_ips.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/index.html
index cd1b339b8e..7784ceb4a8 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/dash_floating_ips.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/floating_ips/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="floatingips" %}
@@ -14,12 +14,12 @@
 
 {% block dash_main %}
   {% if floating_ips %}
-    {% include 'django_openstack/dash/floating_ips/_floating_ips_list.html' %}
+    {% include 'django_openstack/dash/floating_ips/_list.html' %}
   {% else %}
     <div class="message_box info">
       <h2>Info</h2>
       <p>There are currently no floating ips assigned to your tenant.</p>
     </div>
   {% endif %}
-  {% include "django_openstack/dash/floating_ips/_allocate_floating_ip.html" with form=allocate_form %}
+  {% include "django_openstack/dash/floating_ips/_allocate.html" with form=allocate_form %}
 {% endblock %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/images/_image_list.html b/django-openstack/django_openstack/templates/django_openstack/dash/images/_list.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/images/_image_list.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/images/_list.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/images/dash_images.html b/django-openstack/django_openstack/templates/django_openstack/dash/images/index.html
similarity index 80%
rename from django-openstack/django_openstack/templates/django_openstack/dash/images/dash_images.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/images/index.html
index 094f3f4bc2..cc180d7f7c 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/images/dash_images.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/images/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="images" %}
@@ -14,7 +14,7 @@
 
 {% block dash_main %}
   {% if images %}
-    {% include 'django_openstack/dash/images/_image_list.html' %}
+    {% include 'django_openstack/dash/images/_list.html' %}
 
   {% endif %}
 {% endblock %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/images/dash_launch.html b/django-openstack/django_openstack/templates/django_openstack/dash/images/launch.html
similarity index 96%
rename from django-openstack/django_openstack/templates/django_openstack/dash/images/dash_launch.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/images/launch.html
index 7c5ad24b83..b400931b10 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/images/dash_launch.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/images/launch.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="images" %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/instances/_instance_form.html b/django-openstack/django_openstack/templates/django_openstack/dash/instances/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/instances/_instance_form.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/instances/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/instances/_instance_list.html b/django-openstack/django_openstack/templates/django_openstack/dash/instances/_list.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/instances/_instance_list.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/instances/_list.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_instances.html b/django-openstack/django_openstack/templates/django_openstack/dash/instances/index.html
similarity index 93%
rename from django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_instances.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/instances/index.html
index efaa92f1f3..c4717a14e6 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_instances.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/instances/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="instances" %}
@@ -14,7 +14,7 @@
 
 {% block dash_main %}
   {% if instances %}
-    {% include 'django_openstack/dash/instances/_instance_list.html' %}
+    {% include 'django_openstack/dash/instances/_list.html' %}
   {% else %}
     <div class="message_box info">
       <h2>Info</h2>
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_instance_update.html b/django-openstack/django_openstack/templates/django_openstack/dash/instances/update.html
similarity index 89%
rename from django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_instance_update.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/instances/update.html
index c977d1fcd3..32bd962a3e 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_instance_update.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/instances/update.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="instances" %}
@@ -14,7 +14,7 @@
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/dash/instances/_instance_form.html' with form=form %}
+      {% include 'django_openstack/dash/instances/_form.html' with form=form %}
       <h3><a href="{% url dash_instances request.user.tenant %}"><< Return to Instances List</a></h3>
     </div>
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_usage.csv b/django-openstack/django_openstack/templates/django_openstack/dash/instances/usage.csv
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_usage.csv
rename to django-openstack/django_openstack/templates/django_openstack/dash/instances/usage.csv
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_usage.html b/django-openstack/django_openstack/templates/django_openstack/dash/instances/usage.html
similarity index 98%
rename from django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_usage.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/instances/usage.html
index 2e3a7f3a58..153dbfd712 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/instances/dash_usage.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/instances/usage.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 {% load parse_date %}
 {% load sizeformat %}
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_delete_keypair.html b/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_delete.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_delete_keypair.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_delete.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_keypair_form.html b/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_keypair_form.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_keypair_list.html b/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_list.html
similarity index 87%
rename from django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_keypair_list.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_list.html
index d05bb583e6..b95855c794 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_keypair_list.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/_list.html
@@ -10,7 +10,7 @@
     <td>{{ keypair.fingerprint }}</td>
     <td id="actions">
       <ul>
-        <li class="form">{% include "django_openstack/dash/keypairs/_delete_keypair.html" with form=delete_form %}</li>
+        <li class="form">{% include "django_openstack/dash/keypairs/_delete.html" with form=delete_form %}</li>
       </ul>
     </td>
   </tr>
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/dash_keypairs_create.html b/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/create.html
similarity index 89%
rename from django-openstack/django_openstack/templates/django_openstack/dash/keypairs/dash_keypairs_create.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/keypairs/create.html
index 3d53cd2c97..fcac945daf 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/dash_keypairs_create.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/create.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="keypairs" %}
@@ -27,7 +27,7 @@
   <div class="dash_block">
     <div class="left">
       <h3>Your private key is being downloaded.</h3>
-      {% include 'django_openstack/dash/keypairs/_keypair_form.html' with form=create_form %}
+      {% include 'django_openstack/dash/keypairs/_form.html' with form=create_form %}
       <h3><a href="{% url dash_keypairs request.user.tenant %}"><< Return to keypairs list</a></h3>
     </div>
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/dash_keypairs.html b/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/index.html
similarity index 87%
rename from django-openstack/django_openstack/templates/django_openstack/dash/keypairs/dash_keypairs.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/keypairs/index.html
index 8de4e1955d..2b096466ab 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/dash_keypairs.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/keypairs/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="keypairs" %}
@@ -14,7 +14,7 @@
 
 {% block dash_main %}
   {% if keypairs %}
-    {% include 'django_openstack/dash/keypairs/_keypair_list.html' %}
+    {% include 'django_openstack/dash/keypairs/_list.html' %}
     <a id="keypairs_create_link" class="action_link large-rounded" href="{% url dash_keypairs_create request.user.tenant %}">Create New Keypair</a>
   {% else %}
     <div class="message_box info">
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/networks/_delete_network.html b/django-openstack/django_openstack/templates/django_openstack/dash/networks/_delete.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/networks/_delete_network.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/networks/_delete.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/networks/_network_detail.html b/django-openstack/django_openstack/templates/django_openstack/dash/networks/_detail.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/networks/_network_detail.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/networks/_detail.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/networks/_network_form.html b/django-openstack/django_openstack/templates/django_openstack/dash/networks/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/networks/_network_form.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/networks/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/networks/_network_list.html b/django-openstack/django_openstack/templates/django_openstack/dash/networks/_list.html
similarity index 93%
rename from django-openstack/django_openstack/templates/django_openstack/dash/networks/_network_list.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/networks/_list.html
index 1a833fc441..0177afd150 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/networks/_network_list.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/networks/_list.html
@@ -17,7 +17,7 @@
           <td>{{network.used}}</td>
           <td id="actions">
             <ul>
-              <li class="form">{% include "django_openstack/dash/networks/_delete_network.html" with form=delete_form %}</li>
+              <li class="form">{% include "django_openstack/dash/networks/_delete.html" with form=delete_form %}</li>
               <li><a href='{% url dash_network_rename request.user.tenant network.id %}'>Rename</a></li>
             </ul>
         </td>
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/networks/_rename_network.html b/django-openstack/django_openstack/templates/django_openstack/dash/networks/_rename.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/networks/_rename_network.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/networks/_rename.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_network_create.html b/django-openstack/django_openstack/templates/django_openstack/dash/networks/create.html
similarity index 82%
rename from django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_network_create.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/networks/create.html
index 6e8de0e0aa..62e389fb2a 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_network_create.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/networks/create.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -14,7 +14,7 @@
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/dash/networks/_network_form.html' with form=network_form %}
+      {% include 'django_openstack/dash/networks/_form.html' with form=network_form %}
       <h3><a href="{% url dash_networks request.user.tenant %}"><< Return to networks list</a></h3>
     </div>
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_networks_detail.html b/django-openstack/django_openstack/templates/django_openstack/dash/networks/detail.html
similarity index 89%
rename from django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_networks_detail.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/networks/detail.html
index 4bee2ffc3a..38ab1b2717 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_networks_detail.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/networks/detail.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -19,7 +19,7 @@
 
 {% block dash_main %}
   {% if network.ports %}
-    {% include 'django_openstack/dash/networks/_network_detail.html' %}
+    {% include 'django_openstack/dash/networks/_detail.html' %}
     <a id="network_create_link" class="action_link large-rounded" href="{% url dash_ports_create request.user.tenant network.id %}">Create Ports</a>
   {% else %}
     <div class="message_box info">
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_networks.html b/django-openstack/django_openstack/templates/django_openstack/dash/networks/index.html
similarity index 87%
rename from django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_networks.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/networks/index.html
index 5eac9a4fa7..ea0f62a248 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_networks.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/networks/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -14,7 +14,7 @@
 
 {% block dash_main %}
   {% if networks %}
-    {% include 'django_openstack/dash/networks/_network_list.html' %}
+    {% include 'django_openstack/dash/networks/_list.html' %}
     <a id="network_create_link" class="action_link large-rounded" href="{% url dash_network_create request.user.tenant %}">Create New Network</a>
   {% else %}
     <div class="message_box info">
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_network_rename.html b/django-openstack/django_openstack/templates/django_openstack/dash/networks/rename.html
similarity index 94%
rename from django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_network_rename.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/networks/rename.html
index 1533672e7f..9bd1f92247 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/networks/dash_network_rename.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/networks/rename.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/objects/_copy_object.html b/django-openstack/django_openstack/templates/django_openstack/dash/objects/_copy.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/objects/_copy_object.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/objects/_copy.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/objects/_delete_object.html b/django-openstack/django_openstack/templates/django_openstack/dash/objects/_delete.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/objects/_delete_object.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/objects/_delete.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/objects/_object_filter.html b/django-openstack/django_openstack/templates/django_openstack/dash/objects/_filter.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/objects/_object_filter.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/objects/_filter.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/objects/_object_form.html b/django-openstack/django_openstack/templates/django_openstack/dash/objects/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/objects/_object_form.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/objects/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/objects/_object_list.html b/django-openstack/django_openstack/templates/django_openstack/dash/objects/_list.html
similarity index 91%
rename from django-openstack/django_openstack/templates/django_openstack/dash/objects/_object_list.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/objects/_list.html
index c4599e9bec..65ccd68004 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/objects/_object_list.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/objects/_list.html
@@ -9,7 +9,7 @@
     <td id="actions">
       <ul>
         <li><a href="{% url dash_object_copy request.user.tenant container_name object.name %}">Copy</a></li>
-        <li class="form">{% include "django_openstack/dash/objects/_delete_object.html" with form=delete_form %}</li>
+        <li class="form">{% include "django_openstack/dash/objects/_delete.html" with form=delete_form %}</li>
         <li><a href="{% url dash_objects_download request.user.tenant container_name object.name %}">Download</a>
       </ul>
     </td>
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_object_copy.html b/django-openstack/django_openstack/templates/django_openstack/dash/objects/copy.html
similarity index 83%
rename from django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_object_copy.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/objects/copy.html
index 2950f285c0..bef46a2e1a 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_object_copy.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/objects/copy.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="containers" %}
@@ -16,7 +16,7 @@
   <div class="dash_block wide form">
     <div class="left">
       <h3>Copy Object: '{{object_name}}'</h3>
-      {% include 'django_openstack/dash/objects/_copy_object.html' with form=copy_form greeting="HI" %}
+      {% include 'django_openstack/dash/objects/_copy.html' with form=copy_form greeting="HI" %}
       <h3><a href="{% url dash_objects request.user.tenant container_name %}">&lt;&lt; Return to objects list</a></h3>
     </div>
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_objects.html b/django-openstack/django_openstack/templates/django_openstack/dash/objects/index.html
similarity index 82%
rename from django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_objects.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/objects/index.html
index 9ddd42dcf9..6c7c5a8705 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_objects.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/objects/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="containers" %}
@@ -11,7 +11,7 @@
     <h2>Objects</h2>
     <div class="right">
       <div class='search'>
-        {% include 'django_openstack/dash/objects/_object_filter.html' with form=filter_form %}
+        {% include 'django_openstack/dash/objects/_filter.html' with form=filter_form %}
       </div>
       <a class="refresh" title="Refresh" href="{% url dash_objects request.user.tenant container_name %}">Refresh List</a>
     </div>
@@ -22,7 +22,7 @@
   <h3 class="container_name"><span>Container:</span> {{ container_name }}</h3>
 
   {% if objects %}
-    {% include 'django_openstack/dash/objects/_object_list.html' %}
+    {% include 'django_openstack/dash/objects/_list.html' %}
   {% else %}
     <div class="message_box info">
       <h2>Info</h2>
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_objects_upload.html b/django-openstack/django_openstack/templates/django_openstack/dash/objects/upload.html
similarity index 87%
rename from django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_objects_upload.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/objects/upload.html
index de6172aa85..56e86366c3 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/objects/dash_objects_upload.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/objects/upload.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="containers" %}
@@ -15,7 +15,7 @@
 
   <div class="dash_block wide form">
     <div class="left">
-      {% include 'django_openstack/dash/objects/_object_form.html' with form=upload_form %}
+      {% include 'django_openstack/dash/objects/_form.html' with form=upload_form %}
       <h3><a href="{% url dash_objects request.user.tenant container_name %}">&lt;&lt; Return to objects list</a></h3>
     </div>
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/ports/_attach_port.html b/django-openstack/django_openstack/templates/django_openstack/dash/ports/_attach.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/ports/_attach_port.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/ports/_attach.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/ports/_create_port.html b/django-openstack/django_openstack/templates/django_openstack/dash/ports/_create.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/ports/_create_port.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/ports/_create.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/ports/dash_port_attach.html b/django-openstack/django_openstack/templates/django_openstack/dash/ports/attach.html
similarity index 89%
rename from django-openstack/django_openstack/templates/django_openstack/dash/ports/dash_port_attach.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/ports/attach.html
index 62b4d1f2bf..d0de5ae3d6 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/ports/dash_port_attach.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/ports/attach.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -33,7 +33,7 @@
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/dash/ports/_attach_port.html' with form=attach_form %}
+      {% include 'django_openstack/dash/ports/_attach.html' with form=attach_form %}
       <h3><a href="{% url dash_networks_detail request.user.tenant network %}"><< Return to network detail</a></h3>
     </div>
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/ports/dash_ports_create.html b/django-openstack/django_openstack/templates/django_openstack/dash/ports/create.html
similarity index 84%
rename from django-openstack/django_openstack/templates/django_openstack/dash/ports/dash_ports_create.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/ports/create.html
index 446be1f2a5..f5018775ed 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/ports/dash_ports_create.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/ports/create.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="networks" %}
@@ -14,7 +14,7 @@
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/dash/ports/_create_port.html' with form=create_form %}
+      {% include 'django_openstack/dash/ports/_create.html' with form=create_form %}
       <h3><a href="{% url dash_networks_detail request.user.tenant network_id %}"><< Return to network detail</a></h3>
     </div>
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_delete_security_group.html b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_delete.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_delete_security_group.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_delete.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_delete_security_group_rule.html b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_delete_rule.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_delete_security_group_rule.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_delete_rule.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_security_group_form.html b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_security_group_form.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_security_group_list.html b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_list.html
similarity index 90%
rename from django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_security_group_list.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_list.html
index b7b94fd560..52c7535629 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_security_group_list.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/_list.html
@@ -14,7 +14,7 @@
       <ul>
         <li><a href="{% url dash_security_groups_edit_rules request.user.tenant security_group.id %}">Edit Rules</a></li>
         {% if security_group.name != 'default' %}
-          <li class="form">{% include "django_openstack/dash/security_groups/_delete_security_group.html" with form=delete_form %}</li>
+          <li class="form">{% include "django_openstack/dash/security_groups/_delete.html" with form=delete_form %}</li>
         {% endif %}
       </ul>
     </td>
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups_create.html b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/create.html
similarity index 79%
rename from django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups_create.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/security_groups/create.html
index 4f427179e1..242871b937 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups_create.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/create.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="security_groups" %}
@@ -13,7 +13,7 @@
 {% block dash_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/dash/security_groups/_security_group_form.html' %}
+      {% include 'django_openstack/dash/security_groups/_form.html' %}
     </div>
 
     <div class="right">
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups_edit_rules.html b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/edit_rules.html
similarity index 93%
rename from django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups_edit_rules.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/security_groups/edit_rules.html
index 33827617b2..b1fcf5530e 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups_edit_rules.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/edit_rules.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="security_groups" %}
@@ -32,7 +32,7 @@
             <td>{{rule.ip_range.cidr}}</td>
             <td id="actions">
               <ul>
-                <li class="form">{% include "django_openstack/dash/security_groups/_delete_security_group_rule.html" with form=delete_form %}</li>
+                <li class="form">{% include "django_openstack/dash/security_groups/_delete_rule.html" with form=delete_form %}</li>
               </ul>
             </td>
           </tr>
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups.html b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/index.html
similarity index 87%
rename from django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/security_groups/index.html
index db7e47450d..a22b9a8a9b 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/dash_security_groups.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/security_groups/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="security_groups" %}
@@ -14,7 +14,7 @@
 
 {% block dash_main %}
   {% if security_groups %}
-    {% include 'django_openstack/dash/security_groups/_security_group_list.html' %}
+    {% include 'django_openstack/dash/security_groups/_list.html' %}
     <a id="security_groups_create_link" class="action_link large-rounded" href="{% url dash_security_groups_create request.user.tenant %}">Create Security Group</a>
   {% else %}
     <div class="message_box info">
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/snapshots/_snapshot_form.html b/django-openstack/django_openstack/templates/django_openstack/dash/snapshots/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/dash/snapshots/_snapshot_form.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/snapshots/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/snapshots/dash_snapshots_create.html b/django-openstack/django_openstack/templates/django_openstack/dash/snapshots/create.html
similarity index 84%
rename from django-openstack/django_openstack/templates/django_openstack/dash/snapshots/dash_snapshots_create.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/snapshots/create.html
index 6e7f0d8e9b..b0038f62a7 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/snapshots/dash_snapshots_create.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/snapshots/create.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="snapshots" %}
@@ -22,7 +22,7 @@
   <div class="dash_block">
     <div class="left">
       <h3>Choose a name for your snapshot.</h3>
-      {% include 'django_openstack/dash/snapshots/_snapshot_form.html' with form=create_form %}
+      {% include 'django_openstack/dash/snapshots/_form.html' with form=create_form %}
       <h3><a href="{% url dash_snapshots request.user.tenant %}"><< Return to snapshots list</a></h3>
     </div>
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/dash/snapshots/dash_snapshots.html b/django-openstack/django_openstack/templates/django_openstack/dash/snapshots/index.html
similarity index 86%
rename from django-openstack/django_openstack/templates/django_openstack/dash/snapshots/dash_snapshots.html
rename to django-openstack/django_openstack/templates/django_openstack/dash/snapshots/index.html
index d0476f9c03..df407e5c41 100644
--- a/django-openstack/django_openstack/templates/django_openstack/dash/snapshots/dash_snapshots.html
+++ b/django-openstack/django_openstack/templates/django_openstack/dash/snapshots/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/dash/dash_base.html' %}
+{% extends 'django_openstack/dash/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="snapshots" %}
@@ -14,7 +14,7 @@
 
 {% block dash_main %}
   {% if images %}
-    {% include 'django_openstack/dash/images/_image_list.html' %}
+    {% include 'django_openstack/dash/images/_list.html' %}
   {% else %}
     <div class="message_box info">
       <h2>Info</h2>
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/_syspanel_sidebar.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/_sidebar.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/_syspanel_sidebar.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/_sidebar.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/syspanel_base.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/base.html
similarity index 84%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/syspanel_base.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/base.html
index 78fdccae2a..9f5d30559c 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/syspanel_base.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/base.html
@@ -6,7 +6,7 @@
   {% endwith %}
 {% endblock %}
 {% block sidebar %}
-  {% include 'django_openstack/syspanel/_syspanel_sidebar.html' %}
+  {% include 'django_openstack/syspanel/_sidebar.html' %}
 {% endblock %}
 
 {% block main %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_create_flavor.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_create.html
similarity index 60%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_create_flavor.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_create.html
index b45f0873d5..8a74f7d0db 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_create_flavor.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_create.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/flavors/_flavor_form.html' %}
+{% extends 'django_openstack/syspanel/flavors/_form.html' %}
 
 {% block submit %}
   <input type="submit" value="Create Flavor" class="large-rounded" />
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_delete_flavor.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_delete.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_delete_flavor.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_delete.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_flavor_form.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_flavor_form.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_syspanel_flavor_list.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_list.html
similarity index 90%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_syspanel_flavor_list.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_list.html
index 5f8b15a9f0..74d4e0cc82 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_syspanel_flavor_list.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/_list.html
@@ -16,7 +16,7 @@
       <td>{{flavor.disk}}GB</td>
       <td id="actions">
         <ul>
-          <li class="form">{% include "django_openstack/syspanel/flavors/_delete_flavor.html" with form=delete_form %}</li>
+          <li class="form">{% include "django_openstack/syspanel/flavors/_delete.html" with form=delete_form %}</li>
         </ul>
       </td>
     </tr>
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/syspanel_create_flavor.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/create.html
similarity index 92%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/syspanel_create_flavor.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/create.html
index 319dc354ca..f02708f4d2 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/syspanel_create_flavor.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/create.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="flavors" %}
@@ -29,7 +29,7 @@
         </ul>
       </div>
       <div class="left">
-        {% include "django_openstack/syspanel/flavors/_create_flavor.html" %}
+        {% include "django_openstack/syspanel/flavors/_create.html" %}
       </div>
       <div class="right">
         <h3>Description:</h3>
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/syspanel_flavors.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/index.html
similarity index 80%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/syspanel_flavors.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/index.html
index cec3b5a0e2..1e709179ad 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/syspanel_flavors.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/flavors/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="flavors" %}
@@ -13,6 +13,6 @@
 {% endblock page_header %}
 
 {% block syspanel_main %}
-  {% include "django_openstack/syspanel/flavors/_syspanel_flavor_list.html" %}
+  {% include "django_openstack/syspanel/flavors/_list.html" %}
   <a id="flavor_create_link" class="action_link large-rounded" href="{% url syspanel_flavors_create %}">Create New Flavor </a>
 {% endblock %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/images/_delete_image.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/images/_delete.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/images/_delete_image.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/images/_delete.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/images/_image_form.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/images/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/images/_image_form.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/images/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/images/_syspanel_image_list.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/images/_list.html
similarity index 92%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/images/_syspanel_image_list.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/images/_list.html
index d420de3f46..af40d270f3 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/images/_syspanel_image_list.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/images/_list.html
@@ -21,8 +21,8 @@
       <td>{{image.status|capfirst}}</td>
       <td id="actions">
         <ul>
-          <li class="form">{% include "django_openstack/syspanel/images/_delete_image.html" with form=delete_form %}</li>
-          {# <li class="form">{% include "django_openstack/syspanel/images/_toggle_image.html" with form=toggle_form %}</li> #}
+          <li class="form">{% include "django_openstack/syspanel/images/_delete.html" with form=delete_form %}</li>
+          {# <li class="form">{% include "django_openstack/syspanel/images/_toggle.html" with form=toggle_form %}</li> #}
 
           <li><a href="{% url syspanel_images_update image.id %}">Edit</a></li>
         </ul>
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/images/_toggle_image.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/images/_toggle.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/images/_toggle_image.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/images/_toggle.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/images/syspanel_images.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/images/index.html
similarity index 76%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/images/syspanel_images.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/images/index.html
index 4dc90a08e5..2d428fad9b 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/images/syspanel_images.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/images/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="images" %}
@@ -13,5 +13,5 @@
 {% endblock page_header %}
 
 {% block syspanel_main %}
-  {% include "django_openstack/syspanel/images/_syspanel_image_list.html" %}
+  {% include "django_openstack/syspanel/images/_list.html" %}
 {% endblock %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/images/syspanel_image_update.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/images/update.html
similarity index 80%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/images/syspanel_image_update.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/images/update.html
index 9b30348ee2..d2efc1eb00 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/images/syspanel_image_update.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/images/update.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="images" %}
@@ -13,7 +13,7 @@
 {% block syspanel_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/syspanel/images/_image_form.html' %}
+      {% include 'django_openstack/syspanel/images/_form.html' %}
     </div>
 
     <div class="right">
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/_syspanel_instance_list.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/_list.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/instances/_syspanel_instance_list.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/instances/_list.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_instances.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/index.html
similarity index 92%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_instances.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/instances/index.html
index 68f38392af..32c89669a1 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_instances.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="instances" %}
@@ -14,7 +14,7 @@
 
 {% block syspanel_main %}
   {% if instances %}
-    {% include 'django_openstack/syspanel/instances/_syspanel_instance_list.html' %}
+    {% include 'django_openstack/syspanel/instances/_list.html' %}
   {% else %}
     <div class="message_box info">
       <h2>Info</h2>
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_tenant_usage.csv b/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/tenant_usage.csv
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_tenant_usage.csv
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/instances/tenant_usage.csv
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_tenant_usage.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/tenant_usage.html
similarity index 98%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_tenant_usage.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/instances/tenant_usage.html
index 7cd126dd2d..2615dc5a94 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_tenant_usage.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/tenant_usage.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 {% load parse_date %}
 {% load sizeformat %}
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_usage.csv b/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/usage.csv
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_usage.csv
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/instances/usage.csv
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_usage.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/usage.html
similarity index 98%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_usage.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/instances/usage.html
index 271b266292..eb01704cd0 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/syspanel_usage.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/instances/usage.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 {% load sizeformat %}
 
 {# default landing page for a admin user #}
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/quotas/syspanel_quotas.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/quotas/index.html
similarity index 91%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/quotas/syspanel_quotas.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/quotas/index.html
index 17614bc4e1..b51bcd4d96 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/quotas/syspanel_quotas.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/quotas/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="quotas" %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/services/_syspanel_service_list.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/services/_list.html
similarity index 95%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/services/_syspanel_service_list.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/services/_list.html
index 66a37d334b..c718d0c584 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/services/_syspanel_service_list.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/services/_list.html
@@ -44,7 +44,7 @@
       <td>{{service.up}}</td>
       <td id="actions">
         <ul>
-          <li class="form">{% include "django_openstack/syspanel/services/_service_toggle_enabled.html" with form=service_toggle_enabled_form %}</li>
+          <li class="form">{% include "django_openstack/syspanel/services/_toggle.html" with form=service_toggle_enabled_form %}</li>
         </ul>
       </td>
     </tr>
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/services/_service_toggle_enabled.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/services/_toggle.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/services/_service_toggle_enabled.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/services/_toggle.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/services/syspanel_services.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/services/index.html
similarity index 76%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/services/syspanel_services.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/services/index.html
index b6378365a3..bdbe71e4cd 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/services/syspanel_services.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/services/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="services" %}
@@ -13,6 +13,6 @@
 {% endblock page_header %}
 
 {% block syspanel_main %}
-  {% include "django_openstack/syspanel/services/_syspanel_service_list.html" %}
+  {% include "django_openstack/syspanel/services/_list.html" %}
 {% endblock %}
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_add_tenant_user.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_add_user.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_add_tenant_user.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_add_user.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_create_tenant_form.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_create_form.html
similarity index 60%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_create_tenant_form.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_create_form.html
index 2c72fc3a66..7a3e146815 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_create_tenant_form.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_create_form.html
@@ -1,4 +1,4 @@
-{% extends "django_openstack/syspanel/tenants/_tenant_form.html" %}
+{% extends "django_openstack/syspanel/tenants/_form.html" %}
 
 {% block submit %}
   <input type="submit" value="Create Tenant" class="large-rounded" />
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_tenant_delete.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_delete.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_tenant_delete.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_delete.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_tenant_form.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_tenant_form.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_syspanel_tenant_list.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_list.html
similarity index 91%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_syspanel_tenant_list.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_list.html
index 61aa19955e..1905b62077 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_syspanel_tenant_list.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_list.html
@@ -12,7 +12,7 @@
       <td>{{tenant.enabled}}</td>
       <td id="actions">
         <ul>
-          <li class="form">{% include "django_openstack/syspanel/tenants/_tenant_delete.html" with form=tenant_delete_form %}</li>
+          <li class="form">{% include "django_openstack/syspanel/tenants/_delete.html" with form=tenant_delete_form %}</li>
           <li><a href="{% url syspanel_tenant_update tenant.id %}">Edit</a></li>
           <li><a href="{% url syspanel_tenant_users tenant.id %}">View Members</a></li>
           <li><a href="{% url syspanel_tenant_quotas tenant.id %}">Modify Quotas</a></li>
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_remove_tenant_user.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_remove_user.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_remove_tenant_user.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_remove_user.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_update_tenant_form.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_update_form.html
similarity index 60%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_update_tenant_form.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_update_form.html
index 7522303582..1c7af587ca 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_update_tenant_form.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/_update_form.html
@@ -1,4 +1,4 @@
-{% extends "django_openstack/syspanel/tenants/_tenant_form.html" %}
+{% extends "django_openstack/syspanel/tenants/_form.html" %}
 
 {% block submit %}
   <input type="submit" value="Update Tenant" class="large-rounded" />
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_create.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/create.html
similarity index 79%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_create.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/create.html
index fd155198ed..73430dba49 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_create.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/create.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="tenants" %}
@@ -13,7 +13,7 @@
 {% block syspanel_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/syspanel/tenants/_create_tenant_form.html' %}
+      {% include 'django_openstack/syspanel/tenants/_create_form.html' %}
     </div>
 
     <div class="right">
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenants.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/index.html
similarity index 80%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenants.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/index.html
index 9a95f2a0b9..f8cc42ded8 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenants.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="tenants" %}
@@ -13,7 +13,7 @@
 {% endblock page_header %}
 
 {% block syspanel_main %}
-  {% include "django_openstack/syspanel/tenants/_syspanel_tenant_list.html" %}
+  {% include "django_openstack/syspanel/tenants/_list.html" %}
   <a id="tenant_create_link" class="action_link large-rounded" href="{% url syspanel_tenants_create %}">Create New Tenant </a>
 {% endblock %}
 
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_quotas.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/quotas.html
similarity index 91%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_quotas.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/quotas.html
index 4e7136bd8a..250edb778d 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_quotas.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/quotas.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="tenants" %}
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_update.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/update.html
similarity index 78%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_update.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/update.html
index f41d443bdb..7ea051004d 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_update.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/update.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="tenants" %}
@@ -13,7 +13,7 @@
 {% block syspanel_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/syspanel/tenants/_update_tenant_form.html' %}
+      {% include 'django_openstack/syspanel/tenants/_update_form.html' %}
     </div>
 
     <div class="right">
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_users.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/users.html
similarity index 88%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_users.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/users.html
index 0dc6e0d52b..c77ffde38c 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/syspanel_tenant_users.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/tenants/users.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="tenants" %}
@@ -29,7 +29,7 @@
             <td>{{user.email}}</td>
             <td id="actions">
               <ul>
-                <li class="form">{% include "django_openstack/syspanel/tenants/_remove_tenant_user.html" with form=remove_user_form %}</li>
+                <li class="form">{% include "django_openstack/syspanel/tenants/_remove_user.html" with form=remove_user_form %}</li>
               </ul>
             </td>
         </tr>
@@ -55,7 +55,7 @@
             <td>{{user}}</td>
             <td id="actions">
               <ul>
-                <li class="form">{% include "django_openstack/syspanel/tenants/_add_tenant_user.html" with form=add_user_form %}</li>
+                <li class="form">{% include "django_openstack/syspanel/tenants/_add_user.html" with form=add_user_form %}</li>
               </ul>
             </td>
         </tr>
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_create_user_form.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_create_form.html
similarity index 61%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/users/_create_user_form.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/users/_create_form.html
index 7c756bbe9c..28620cc6e5 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_create_user_form.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_create_form.html
@@ -1,4 +1,4 @@
-{% extends "django_openstack/syspanel/users/_user_form.html" %}
+{% extends "django_openstack/syspanel/users/_form.html" %}
 
 {% block submit %}
   <input type="submit" value="Create User" class="large-rounded" />
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_user_delete.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_delete.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/users/_user_delete.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/users/_delete.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_user_enable_disable.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_enable_disable.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/users/_user_enable_disable.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/users/_enable_disable.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_user_form.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_form.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/users/_user_form.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/users/_form.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_user_toggle_enabled.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_toggle_enabled.html
similarity index 100%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/users/_user_toggle_enabled.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/users/_toggle_enabled.html
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_update_user_form.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_update_form.html
similarity index 61%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/users/_update_user_form.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/users/_update_form.html
index 5cdf421226..5aca677252 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_update_user_form.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/_update_form.html
@@ -1,4 +1,4 @@
-{% extends "django_openstack/syspanel/users/_user_form.html" %}
+{% extends "django_openstack/syspanel/users/_form.html" %}
 
 {% block submit %}
   <input type="submit" value="Update User" class="large-rounded" />
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/syspanel_user_create.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/create.html
similarity index 81%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/users/syspanel_user_create.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/users/create.html
index ab18153e25..b09dcb5254 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/syspanel_user_create.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/create.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="users" %}
@@ -14,7 +14,7 @@
 {% block syspanel_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/syspanel/users/_create_user_form.html' %}
+      {% include 'django_openstack/syspanel/users/_create_form.html' %}
     </div>
 
     <div class="right">
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/syspanel_users.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/index.html
similarity index 86%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/users/syspanel_users.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/users/index.html
index 32548df56e..d3237c7c43 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/syspanel_users.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/index.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="users" %}
@@ -28,8 +28,8 @@
           <td>{{user.tenantId}}</td>
           <td id="actions">
             <ul>
-              <li class="form">{% include "django_openstack/syspanel/users/_user_enable_disable.html" with form=user_enable_disable_form %}</li>
-              <li class="form">{% include "django_openstack/syspanel/users/_user_delete.html" with form=user_delete_form %}</li>
+              <li class="form">{% include "django_openstack/syspanel/users/_enable_disable.html" with form=user_enable_disable_form %}</li>
+              <li class="form">{% include "django_openstack/syspanel/users/_delete.html" with form=user_delete_form %}</li>
               <li><a href="{% url syspanel_users_update user.id %}">Edit</a></li>
             </ul>
           </td>
diff --git a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/syspanel_user_update.html b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/update.html
similarity index 82%
rename from django-openstack/django_openstack/templates/django_openstack/syspanel/users/syspanel_user_update.html
rename to django-openstack/django_openstack/templates/django_openstack/syspanel/users/update.html
index 5e9f7a69df..413ad81c1c 100644
--- a/django-openstack/django_openstack/templates/django_openstack/syspanel/users/syspanel_user_update.html
+++ b/django-openstack/django_openstack/templates/django_openstack/syspanel/users/update.html
@@ -1,4 +1,4 @@
-{% extends 'django_openstack/syspanel/syspanel_base.html' %}
+{% extends 'django_openstack/syspanel/base.html' %}
 
 {% block sidebar %}
   {% with current_sidebar="users" %}
@@ -14,7 +14,7 @@
 {% block syspanel_main %}
   <div class="dash_block">
     <div class="left">
-      {% include 'django_openstack/syspanel/users/_update_user_form.html' %}
+      {% include 'django_openstack/syspanel/users/_update_form.html' %}
     </div>
 
     <div class="right">
diff --git a/django-openstack/django_openstack/tests/view_tests/dash/container_tests.py b/django-openstack/django_openstack/tests/view_tests/dash/container_tests.py
index 25bed900fc..09ba383dab 100644
--- a/django-openstack/django_openstack/tests/view_tests/dash/container_tests.py
+++ b/django-openstack/django_openstack/tests/view_tests/dash/container_tests.py
@@ -23,7 +23,7 @@ class ContainerViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_containers', args=['tenant']))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/containers/dash_containers.html')
+                'django_openstack/dash/containers/index.html')
         self.assertIn('containers', res.context)
         containers = res.context['containers']
 
@@ -80,7 +80,7 @@ class ContainerViewTests(base.BaseViewTests):
                               args=['tenant']))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/containers/dash_containers_create.html')
+                'django_openstack/dash/containers/create.html')
 
     def test_create_container_post(self):
         formData = {'name': 'containerName',
diff --git a/django-openstack/django_openstack/tests/view_tests/dash/floating_ip_tests.py b/django-openstack/django_openstack/tests/view_tests/dash/floating_ip_tests.py
index e2f907c975..00afbb0223 100644
--- a/django-openstack/django_openstack/tests/view_tests/dash/floating_ip_tests.py
+++ b/django-openstack/django_openstack/tests/view_tests/dash/floating_ip_tests.py
@@ -41,7 +41,7 @@ class FloatingIpViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_floating_ips',
                                       args=[self.TEST_TENANT]))
         self.assertTemplateUsed(res,
-                'django_openstack/dash/floating_ips/dash_floating_ips.html')
+                'django_openstack/dash/floating_ips/index.html')
         self.assertItemsEqual(res.context['floating_ips'], self.floating_ips)
 
         self.mox.VerifyAll()
@@ -60,7 +60,7 @@ class FloatingIpViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_floating_ips_associate',
                                       args=[self.TEST_TENANT, 1]))
         self.assertTemplateUsed(res,
-                'django_openstack/dash/floating_ips/dash_floating_ips_associate.html')
+                'django_openstack/dash/floating_ips/associate.html')
         self.mox.VerifyAll()
 
     def test_associate_post(self):
@@ -144,7 +144,7 @@ class FloatingIpViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_floating_ips_disassociate',
                                       args=[self.TEST_TENANT, 1]))
         self.assertTemplateUsed(res,
-                'django_openstack/dash/floating_ips/dash_floating_ips_associate.html')
+                'django_openstack/dash/floating_ips/associate.html')
         self.mox.VerifyAll()
 
     def test_disassociate_post(self):
diff --git a/django-openstack/django_openstack/tests/view_tests/dash/images_tests.py b/django-openstack/django_openstack/tests/view_tests/dash/images_tests.py
index cb09e8af24..7837f26305 100644
--- a/django-openstack/django_openstack/tests/view_tests/dash/images_tests.py
+++ b/django-openstack/django_openstack/tests/view_tests/dash/images_tests.py
@@ -54,7 +54,7 @@ class ImageViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_images', args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/images/dash_images.html')
+                'django_openstack/dash/images/index.html')
 
         self.assertIn('images', res.context)
         images = res.context['images']
@@ -78,7 +78,7 @@ class ImageViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_images', args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/images/dash_images.html')
+                'django_openstack/dash/images/index.html')
 
         self.mox.VerifyAll()
 
@@ -98,7 +98,7 @@ class ImageViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_images', args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/images/dash_images.html')
+                'django_openstack/dash/images/index.html')
 
         self.mox.VerifyAll()
 
@@ -118,7 +118,7 @@ class ImageViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_images', args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/images/dash_images.html')
+                'django_openstack/dash/images/index.html')
 
         self.mox.VerifyAll()
 
@@ -153,7 +153,7 @@ class ImageViewTests(base.BaseViewTests):
                               args=[self.TEST_TENANT, IMAGE_ID]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/images/dash_launch.html')
+                'django_openstack/dash/images/launch.html')
 
         image = res.context['image']
         self.assertEqual(image.name, self.visibleImage.name)
@@ -270,7 +270,7 @@ class ImageViewTests(base.BaseViewTests):
                               args=[self.TEST_TENANT, IMAGE_ID]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/images/dash_launch.html')
+                'django_openstack/dash/images/launch.html')
 
         form = res.context['form']
 
@@ -311,7 +311,7 @@ class ImageViewTests(base.BaseViewTests):
                               args=[self.TEST_TENANT, IMAGE_ID]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/images/dash_launch.html')
+                'django_openstack/dash/images/launch.html')
 
         form = res.context['form']
 
@@ -384,6 +384,6 @@ class ImageViewTests(base.BaseViewTests):
         res = self.client.post(url, form_data)
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/images/dash_launch.html')
+                'django_openstack/dash/images/launch.html')
 
         self.mox.VerifyAll()
diff --git a/django-openstack/django_openstack/tests/view_tests/dash/instance_tests.py b/django-openstack/django_openstack/tests/view_tests/dash/instance_tests.py
index 285fd76053..8900a42afe 100644
--- a/django-openstack/django_openstack/tests/view_tests/dash/instance_tests.py
+++ b/django-openstack/django_openstack/tests/view_tests/dash/instance_tests.py
@@ -30,7 +30,7 @@ class InstanceViewTests(base.BaseViewTests):
                                       args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-            'django_openstack/dash/instances/dash_instances.html')
+            'django_openstack/dash/instances/index.html')
         self.assertItemsEqual(res.context['instances'], self.servers)
 
         self.mox.VerifyAll()
@@ -46,7 +46,7 @@ class InstanceViewTests(base.BaseViewTests):
                                       args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/instances/dash_instances.html')
+                'django_openstack/dash/instances/index.html')
         self.assertEqual(len(res.context['instances']), 0)
 
         self.mox.VerifyAll()
@@ -177,7 +177,7 @@ class InstanceViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_usage', args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/instances/dash_usage.html')
+                'django_openstack/dash/instances/usage.html')
 
         self.assertEqual(res.context['usage'], TEST_RETURN)
 
@@ -202,7 +202,7 @@ class InstanceViewTests(base.BaseViewTests):
                                                     "?format=csv")
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/instances/dash_usage.csv')
+                'django_openstack/dash/instances/usage.csv')
 
         self.assertEqual(res.context['usage'], TEST_RETURN)
 
@@ -229,7 +229,7 @@ class InstanceViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_usage', args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/instances/dash_usage.html')
+                'django_openstack/dash/instances/usage.html')
 
         self.assertEqual(res.context['usage'], {})
 
@@ -253,7 +253,7 @@ class InstanceViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_overview'))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/instances/dash_usage.html')
+                'django_openstack/dash/instances/usage.html')
 
         self.assertEqual(res.context['usage'], TEST_RETURN)
 
@@ -366,7 +366,7 @@ class InstanceViewTests(base.BaseViewTests):
                                       args=[self.TEST_TENANT, INSTANCE_ID]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/instances/dash_instance_update.html')
+                'django_openstack/dash/instances/update.html')
 
         self.mox.VerifyAll()
 
diff --git a/django-openstack/django_openstack/tests/view_tests/dash/keypair_tests.py b/django-openstack/django_openstack/tests/view_tests/dash/keypair_tests.py
index e67db18163..f01af0b52e 100644
--- a/django-openstack/django_openstack/tests/view_tests/dash/keypair_tests.py
+++ b/django-openstack/django_openstack/tests/view_tests/dash/keypair_tests.py
@@ -25,7 +25,7 @@ class KeyPairViewTests(base.BaseViewTests):
             args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/keypairs/dash_keypairs.html')
+                'django_openstack/dash/keypairs/index.html')
         self.assertItemsEqual(res.context['keypairs'], self.keypairs)
 
         self.mox.VerifyAll()
@@ -45,7 +45,7 @@ class KeyPairViewTests(base.BaseViewTests):
             args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/keypairs/dash_keypairs.html')
+                'django_openstack/dash/keypairs/index.html')
         self.assertEqual(len(res.context['keypairs']), 0)
 
         self.mox.VerifyAll()
@@ -98,7 +98,7 @@ class KeyPairViewTests(base.BaseViewTests):
                                       args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/keypairs/dash_keypairs_create.html')
+                'django_openstack/dash/keypairs/create.html')
 
     def test_create_keypair_post(self):
         KEYPAIR_NAME = 'newKeypair'
diff --git a/django-openstack/django_openstack/tests/view_tests/dash/network_tests.py b/django-openstack/django_openstack/tests/view_tests/dash/network_tests.py
index 410c03e1a8..1f48703b7f 100644
--- a/django-openstack/django_openstack/tests/view_tests/dash/network_tests.py
+++ b/django-openstack/django_openstack/tests/view_tests/dash/network_tests.py
@@ -52,7 +52,7 @@ class NetworkViewTests(base.BaseViewTests):
         res = self.client.get(reverse('dash_networks', args=['tenant']))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/networks/dash_networks.html')
+                'django_openstack/dash/networks/index.html')
         self.assertIn('networks', res.context)
         networks = res.context['networks']
 
@@ -167,7 +167,7 @@ class NetworkViewTests(base.BaseViewTests):
                               args=['tenant', 'n1']))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/networks/dash_networks_detail.html')
+                'django_openstack/dash/networks/detail.html')
         self.assertIn('network', res.context)
 
         network = res.context['network']
diff --git a/django-openstack/django_openstack/tests/view_tests/dash/object_tests.py b/django-openstack/django_openstack/tests/view_tests/dash/object_tests.py
index 9a0b30ea66..abf9de2285 100644
--- a/django-openstack/django_openstack/tests/view_tests/dash/object_tests.py
+++ b/django-openstack/django_openstack/tests/view_tests/dash/object_tests.py
@@ -27,7 +27,7 @@ class ObjectViewTests(base.BaseViewTests):
                                       args=[self.TEST_TENANT,
                                             self.CONTAINER_NAME]))
         self.assertTemplateUsed(res,
-                'django_openstack/dash/objects/dash_objects.html')
+                'django_openstack/dash/objects/index.html')
         self.assertItemsEqual(res.context['objects'], self.swift_objects)
 
         self.mox.VerifyAll()
@@ -38,7 +38,7 @@ class ObjectViewTests(base.BaseViewTests):
                                             self.CONTAINER_NAME]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/objects/dash_objects_upload.html')
+                'django_openstack/dash/objects/upload.html')
 
     def test_upload(self):
         OBJECT_DATA = 'objectData'
@@ -135,7 +135,7 @@ class ObjectViewTests(base.BaseViewTests):
                                             OBJECT_NAME]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/objects/dash_object_copy.html')
+                'django_openstack/dash/objects/copy.html')
 
         self.mox.VerifyAll()
 
@@ -202,6 +202,6 @@ class ObjectViewTests(base.BaseViewTests):
                                formData)
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/objects/dash_objects.html')
+                'django_openstack/dash/objects/index.html')
 
         self.mox.VerifyAll()
diff --git a/django-openstack/django_openstack/tests/view_tests/dash/security_groups_tests.py b/django-openstack/django_openstack/tests/view_tests/dash/security_groups_tests.py
index 405caf79cb..8417cfbf70 100644
--- a/django-openstack/django_openstack/tests/view_tests/dash/security_groups_tests.py
+++ b/django-openstack/django_openstack/tests/view_tests/dash/security_groups_tests.py
@@ -28,7 +28,7 @@ class SecurityGroupsViewTests(base.BaseViewTests):
                               args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/security_groups/dash_security_groups.html')
+                'django_openstack/dash/security_groups/index.html')
         self.assertItemsEqual(res.context['security_groups'],
                               self.security_groups)
 
@@ -49,7 +49,7 @@ class SecurityGroupsViewTests(base.BaseViewTests):
                               args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/security_groups/dash_security_groups.html')
+                'django_openstack/dash/security_groups/index.html')
         self.assertEqual(len(res.context['security_groups']), 0)
 
         self.mox.VerifyAll()
@@ -59,7 +59,7 @@ class SecurityGroupsViewTests(base.BaseViewTests):
                                       args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/security_groups/dash_security_groups_create.html')
+                'django_openstack/dash/security_groups/create.html')
 
     def test_create_security_groups_post(self):
         SECGROUP_NAME = 'fakegroup'
@@ -113,7 +113,7 @@ class SecurityGroupsViewTests(base.BaseViewTests):
                                        formData)
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/security_groups/dash_security_groups_create.html')
+                'django_openstack/dash/security_groups/create.html')
 
         self.mox.VerifyAll()
 
@@ -130,7 +130,7 @@ class SecurityGroupsViewTests(base.BaseViewTests):
                                        args=[self.TEST_TENANT, SECGROUP_ID]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/security_groups/dash_security_groups_edit_rules.html')
+                'django_openstack/dash/security_groups/edit_rules.html')
         self.assertItemsEqual(res.context['security_group'].name,
                               self.security_groups[0].name)
 
diff --git a/django-openstack/django_openstack/tests/view_tests/dash/snapshots_tests.py b/django-openstack/django_openstack/tests/view_tests/dash/snapshots_tests.py
index df34d44f58..4f8aecf62e 100644
--- a/django-openstack/django_openstack/tests/view_tests/dash/snapshots_tests.py
+++ b/django-openstack/django_openstack/tests/view_tests/dash/snapshots_tests.py
@@ -38,7 +38,7 @@ class SnapshotsViewTests(base.BaseViewTests):
                                       args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/snapshots/dash_snapshots.html')
+                'django_openstack/dash/snapshots/index.html')
 
         self.assertIn('images', res.context)
         images = res.context['images']
@@ -60,7 +60,7 @@ class SnapshotsViewTests(base.BaseViewTests):
                                        args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/snapshots/dash_snapshots.html')
+                'django_openstack/dash/snapshots/index.html')
 
         self.mox.VerifyAll()
 
@@ -78,7 +78,7 @@ class SnapshotsViewTests(base.BaseViewTests):
                                        args=[self.TEST_TENANT]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/snapshots/dash_snapshots.html')
+                'django_openstack/dash/snapshots/index.html')
 
         self.mox.VerifyAll()
 
@@ -94,7 +94,7 @@ class SnapshotsViewTests(base.BaseViewTests):
                                             self.good_server.id]))
 
         self.assertTemplateUsed(res,
-                'django_openstack/dash/snapshots/dash_snapshots_create.html')
+                'django_openstack/dash/snapshots/create.html')
         self.mox.VerifyAll()
 
     def test_create_snapshot_get_with_invalid_status(self):
diff --git a/django-openstack/django_openstack/tests/view_tests/syspanel/users_tests.py b/django-openstack/django_openstack/tests/view_tests/syspanel/users_tests.py
index a5ded5ca6e..0b40e0820b 100644
--- a/django-openstack/django_openstack/tests/view_tests/syspanel/users_tests.py
+++ b/django-openstack/django_openstack/tests/view_tests/syspanel/users_tests.py
@@ -25,7 +25,7 @@ class UsersViewTests(base.BaseViewTests):
         res = self.client.get(reverse('syspanel_users'))
 
         self.assertTemplateUsed(res,
-                'django_openstack/syspanel/users/syspanel_users.html')
+                'django_openstack/syspanel/users/index.html')
         self.assertItemsEqual(res.context['users'], self.users)
 
         self.mox.VerifyAll()