diff --git a/nbgrader/server_extensions/formgrader/templates/base.tpl b/nbgrader/server_extensions/formgrader/templates/base.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/base.tpl
rename to nbgrader/server_extensions/formgrader/templates/base.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/base_403.tpl b/nbgrader/server_extensions/formgrader/templates/base_403.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/base_403.tpl
rename to nbgrader/server_extensions/formgrader/templates/base_403.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/base_500.tpl b/nbgrader/server_extensions/formgrader/templates/base_500.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/base_500.tpl
rename to nbgrader/server_extensions/formgrader/templates/base_500.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/feedback.tpl b/nbgrader/server_extensions/formgrader/templates/feedback.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/feedback.tpl
rename to nbgrader/server_extensions/formgrader/templates/feedback.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/formgrade.tpl b/nbgrader/server_extensions/formgrader/templates/formgrade.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/formgrade.tpl
rename to nbgrader/server_extensions/formgrader/templates/formgrade.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/formgrade_404.tpl b/nbgrader/server_extensions/formgrader/templates/formgrade_404.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/formgrade_404.tpl
rename to nbgrader/server_extensions/formgrader/templates/formgrade_404.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/formgrade_macros.tpl b/nbgrader/server_extensions/formgrader/templates/formgrade_macros.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/formgrade_macros.tpl
rename to nbgrader/server_extensions/formgrader/templates/formgrade_macros.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/gradebook_assignments.tpl b/nbgrader/server_extensions/formgrader/templates/gradebook_assignments.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/gradebook_assignments.tpl
rename to nbgrader/server_extensions/formgrader/templates/gradebook_assignments.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/gradebook_base.tpl b/nbgrader/server_extensions/formgrader/templates/gradebook_base.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/gradebook_base.tpl
rename to nbgrader/server_extensions/formgrader/templates/gradebook_base.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/gradebook_notebook_submissions.tpl b/nbgrader/server_extensions/formgrader/templates/gradebook_notebook_submissions.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/gradebook_notebook_submissions.tpl
rename to nbgrader/server_extensions/formgrader/templates/gradebook_notebook_submissions.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/gradebook_notebooks.tpl b/nbgrader/server_extensions/formgrader/templates/gradebook_notebooks.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/gradebook_notebooks.tpl
rename to nbgrader/server_extensions/formgrader/templates/gradebook_notebooks.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/manage_assignments.tpl b/nbgrader/server_extensions/formgrader/templates/manage_assignments.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/manage_assignments.tpl
rename to nbgrader/server_extensions/formgrader/templates/manage_assignments.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/manage_students.tpl b/nbgrader/server_extensions/formgrader/templates/manage_students.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/manage_students.tpl
rename to nbgrader/server_extensions/formgrader/templates/manage_students.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/manage_students_assignments.tpl b/nbgrader/server_extensions/formgrader/templates/manage_students_assignments.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/manage_students_assignments.tpl
rename to nbgrader/server_extensions/formgrader/templates/manage_students_assignments.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/manage_students_base.tpl b/nbgrader/server_extensions/formgrader/templates/manage_students_base.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/manage_students_base.tpl
rename to nbgrader/server_extensions/formgrader/templates/manage_students_base.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/manage_students_notebook_submissions.tpl b/nbgrader/server_extensions/formgrader/templates/manage_students_notebook_submissions.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/manage_students_notebook_submissions.tpl
rename to nbgrader/server_extensions/formgrader/templates/manage_students_notebook_submissions.html.j2
diff --git a/nbgrader/server_extensions/formgrader/templates/manage_submissions.tpl b/nbgrader/server_extensions/formgrader/templates/manage_submissions.html.j2
similarity index 100%
rename from nbgrader/server_extensions/formgrader/templates/manage_submissions.tpl
rename to nbgrader/server_extensions/formgrader/templates/manage_submissions.html.j2