diff --git a/beat/web/dataformats/views.py b/beat/web/dataformats/views.py
index 63665106eb10ccf6c8e3ef03819518d97035049f..2140eda27dc4a51889a925df5abb0e99e9a0d111 100644
--- a/beat/web/dataformats/views.py
+++ b/beat/web/dataformats/views.py
@@ -29,8 +29,7 @@ from django.http import HttpResponseRedirect
 from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.shortcuts import get_object_or_404
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 from django.views.decorators.csrf import csrf_protect
 from django.contrib.auth.decorators import login_required
 from django.conf import settings
@@ -133,14 +132,14 @@ def create(request, name=None):
         form = CreationForm(**form_args)
 
 
-    return render_to_response('dataformats/edition.html',
-                              {
-                                  'form': form,
-                                'object': previous_version,
-                                'op': 'new-version' if previous_version else 'new',
-                                'edition': False,
-                              },
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'dataformats/edition.html',
+                  {
+                    'form': form,
+                    'object': previous_version,
+                    'op': 'new-version' if previous_version else 'new',
+                    'edition': False,
+                  })
 
 
 #----------------------------------------------------------
@@ -210,13 +209,13 @@ def fork(request, author, name, version):
         form = CreationForm(**form_args)
 
 
-    return render_to_response('dataformats/edition.html',
-                              {
-                                  'form': form,
-                                'object': fork_of,
-                                'op': 'fork',
-                              },
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'dataformats/edition.html',
+                  {
+                      'form': form,
+                    'object': fork_of,
+                    'op': 'fork',
+                  })
 
 
 #----------------------------------------------------------
@@ -287,12 +286,12 @@ def edit(request, author, name, version):
 
         form = UpdateForm(**form_args)
 
-    return render_to_response('dataformats/edition.html',
-                              {'form': form,
-                               'op': 'edit',
-                               'object': dataformat,
-                              },
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'dataformats/edition.html',
+                  {'form': form,
+                   'op': 'edit',
+                   'object': dataformat,
+                  })
 
 
 #----------------------------------------------------------
@@ -328,14 +327,14 @@ def view(request, author, name, version=None):
     users = User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username')
 
     # Render the page
-    return render_to_response('dataformats/view.html',
-                              {
-                                  'dataformat': dataformat,
-                                  'owner': owner,
-                                  'users': users,
-                                  'teams': Team.objects.for_user(request.user, True)
-                              },
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'dataformats/view.html',
+                  {
+                      'dataformat': dataformat,
+                      'owner': owner,
+                      'users': users,
+                      'teams': Team.objects.for_user(request.user, True)
+                  })
 
 
 #----------------------------------------------------------
@@ -351,15 +350,15 @@ def diff(request, author1, name1, version1, author2, name2, version2):
 
     """
 
-    return render_to_response('dataformats/diff.html',
-                              {'dataformat1_author':  author1,
-                               'dataformat1_name':    name1,
-                               'dataformat1_version': version1,
-                               'dataformat2_author':  author2,
-                               'dataformat2_name':    name2,
-                               'dataformat2_version': version2,
-                              },
-                              context_instance=RequestContext(request))
+    return render(request,
+                  'dataformats/diff.html',
+                  {'dataformat1_author':  author1,
+                   'dataformat1_name':    name1,
+                   'dataformat1_version': version1,
+                   'dataformat2_author':  author2,
+                   'dataformat2_name':    name2,
+                   'dataformat2_version': version2,
+                  })
 
 
 #----------------------------------------------------------
@@ -378,14 +377,13 @@ def ls(request, author_name):
                                                         author_name).order_by('-creation_date')
     objects = DataFormat.filter_latest_versions(objects)
 
-    return render_to_response('dataformats/list.html',
-                              dict(
-                                  objects=objects,
-                                  author=author,
-                                  owner=(request.user==author),
-                              ),
-                              context_instance=RequestContext(request),
-    )
+    return render(request,
+                  'dataformats/list.html',
+                  dict(
+                      objects=objects,
+                      author=author,
+                      owner=(request.user == author)
+                  ))
 
 
 #----------------------------------------------------------
@@ -398,11 +396,10 @@ def public_ls(request):
     objects = DataFormat.objects.public().order_by('-creation_date')
     objects = DataFormat.filter_latest_versions(objects)
 
-    return render_to_response('dataformats/list.html',
-                              dict(
-                                  objects=objects,
-                                  author=request.user, #anonymous
-                                  owner=False,
-                              ),
-                              context_instance=RequestContext(request),
-    )
+    return render(request,
+                  'dataformats/list.html',
+                  dict(
+                      objects=objects,
+                      author=request.user, #anonymous
+                      owner=False,
+                  ))