diff --git a/swh/web/browse/snapshot_context.py b/swh/web/browse/snapshot_context.py
index 1baf66b7..56c8ddc7 100644
--- a/swh/web/browse/snapshot_context.py
+++ b/swh/web/browse/snapshot_context.py
@@ -1,1379 +1,1379 @@
 # Copyright (C) 2018-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 # Utility module for browsing the archive in a snapshot context.
 
 from collections import defaultdict
 from typing import Any, Dict, List, Optional, Tuple
 
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render
 from django.utils.html import escape
 
 from swh.model.hashutil import hash_to_bytes
 from swh.model.model import Snapshot
 from swh.model.swhids import CoreSWHID, ObjectType
 from swh.web.browse.utils import (
     format_log_entries,
     gen_release_link,
     gen_revision_link,
     gen_revision_log_link,
     gen_revision_url,
     gen_snapshot_link,
     get_directory_entries,
     get_readme_to_display,
 )
 from swh.web.config import get_config
 from swh.web.utils import (
     archive,
     django_cache,
     format_utc_iso_date,
     gen_path_info,
     reverse,
     swh_object_icons,
 )
 from swh.web.utils.exc import BadInputExc, NotFoundExc, http_status_code_message
 from swh.web.utils.identifiers import get_swhids_info
 from swh.web.utils.origin_visits import get_origin_visit
 from swh.web.utils.typing import (
     DirectoryMetadata,
     OriginInfo,
     SnapshotBranchInfo,
     SnapshotContext,
     SnapshotReleaseInfo,
     SWHObjectInfo,
 )
 
 _empty_snapshot_id = Snapshot(branches={}).id.hex()
 
 
 def _get_branch(
     branches: List[SnapshotBranchInfo], branch_name: str, snapshot_id: str
 ) -> Optional[SnapshotBranchInfo]:
     """
     Utility function to get a specific branch from a snapshot.
     Returns None if the branch cannot be found.
     """
     filtered_branches = [b for b in branches if b["name"] == branch_name]
     if filtered_branches:
         return filtered_branches[0]
     else:
         # case where a large branches list has been truncated
         snp = archive.lookup_snapshot(
             snapshot_id,
             branches_from=branch_name,
             branches_count=1,
             target_types=["revision", "alias"],
             # pull request branches must be browsable even if they are hidden
             # by default in branches list
             branch_name_exclude_prefix=None,
         )
         snp_branch, _, _ = process_snapshot_branches(snp)
         if snp_branch and snp_branch[0]["name"] == branch_name:
             branches.append(snp_branch[0])
             return snp_branch[0]
     return None
 
 
 def _get_release(
     releases: List[SnapshotReleaseInfo], release_name: Optional[str], snapshot_id: str
 ) -> Optional[SnapshotReleaseInfo]:
     """
     Utility function to get a specific release from a snapshot.
     Returns None if the release cannot be found.
     """
     filtered_releases = [r for r in releases if r["name"] == release_name]
     if filtered_releases:
         return filtered_releases[0]
     elif release_name:
         # case where a large branches list has been truncated
         try:
             # git origins have specific branches for releases
             snp = archive.lookup_snapshot(
                 snapshot_id,
                 branches_from=f"refs/tags/{release_name}",
                 branches_count=1,
                 target_types=["release"],
             )
         except NotFoundExc:
             snp = archive.lookup_snapshot(
                 snapshot_id,
                 branches_from=release_name,
                 branches_count=1,
                 target_types=["release", "alias"],
             )
         _, snp_release, _ = process_snapshot_branches(snp)
         if snp_release and snp_release[0]["name"] == release_name:
             releases.append(snp_release[0])
             return snp_release[0]
     return None
 
 
 def _branch_not_found(
     branch_type: str,
     branch: str,
     snapshot_id: str,
     snapshot_sizes: Dict[str, int],
     origin_info: Optional[OriginInfo],
     timestamp: Optional[str],
     visit_id: Optional[int],
 ) -> None:
     """
     Utility function to raise an exception when a specified branch/release
     can not be found.
     """
     if branch_type == "branch":
         branch_type = "Branch"
         branch_type_plural = "branches"
         target_type = "revision"
     else:
         branch_type = "Release"
         branch_type_plural = "releases"
         target_type = "release"
 
     if snapshot_id and snapshot_sizes[target_type] == 0:
         msg = "Snapshot with id %s has an empty list" " of %s!" % (
             snapshot_id,
             branch_type_plural,
         )
     elif snapshot_id:
         msg = "%s %s for snapshot with id %s" " not found!" % (
             branch_type,
             branch,
             snapshot_id,
         )
     elif visit_id and snapshot_sizes[target_type] == 0 and origin_info:
         msg = (
             "Origin with url %s"
             " for visit with id %s has an empty list"
             " of %s!" % (origin_info["url"], visit_id, branch_type_plural)
         )
     elif visit_id and origin_info:
         msg = (
             "%s %s associated to visit with"
             " id %s for origin with url %s"
             " not found!" % (branch_type, branch, visit_id, origin_info["url"])
         )
     elif snapshot_sizes[target_type] == 0 and origin_info and timestamp:
         msg = (
             "Origin with url %s"
             " for visit with timestamp %s has an empty list"
             " of %s!" % (origin_info["url"], timestamp, branch_type_plural)
         )
     elif origin_info and timestamp:
         msg = (
             "%s %s associated to visit with"
             " timestamp %s for origin with "
             "url %s not found!" % (branch_type, branch, timestamp, origin_info["url"])
         )
     raise NotFoundExc(escape(msg))
 
 
 def process_snapshot_branches(
     snapshot: Dict[str, Any]
 ) -> Tuple[List[SnapshotBranchInfo], List[SnapshotReleaseInfo], Dict[str, Any]]:
     """
     Process a dictionary describing snapshot branches: extract those
     targeting revisions and releases, put them in two different lists,
     then sort those lists in lexicographical order of the branches' names.
 
     Args:
         snapshot: A dict describing a snapshot as returned for instance by
             :func:`swh.web.utils.archive.lookup_snapshot`
 
     Returns:
         A tuple whose first member is the sorted list of branches
         targeting revisions, second member the sorted list of branches
         targeting releases and third member a dict mapping resolved branch
         aliases to their real target.
     """
     snapshot_branches = snapshot["branches"]
     branches: Dict[str, SnapshotBranchInfo] = {}
     branch_aliases: Dict[str, str] = {}
     releases: Dict[str, SnapshotReleaseInfo] = {}
     revision_to_branch = defaultdict(set)
     revision_to_release = defaultdict(set)
     release_to_branch = defaultdict(set)
     for branch_name, target in snapshot_branches.items():
         if not target:
             # FIXME: display branches with an unknown target anyway
             continue
         target_id = target["target"]
         target_type = target["target_type"]
         if target_type == "revision":
             branches[branch_name] = SnapshotBranchInfo(
                 name=branch_name,
                 alias=False,
                 revision=target_id,
                 date=None,
                 directory=None,
                 message=None,
                 url=None,
             )
             revision_to_branch[target_id].add(branch_name)
         elif target_type == "release":
             release_to_branch[target_id].add(branch_name)
         elif target_type == "alias":
             branch_aliases[branch_name] = target_id
         # FIXME: handle pointers to other object types
 
     def _add_release_info(branch, release, alias=False):
         releases[branch] = SnapshotReleaseInfo(
             name=release["name"],
             alias=alias,
             branch_name=branch,
             date=format_utc_iso_date(release["date"]),
             directory=None,
             id=release["id"],
             message=release["message"],
             target_type=release["target_type"],
             target=release["target"],
             url=None,
         )
 
     def _add_branch_info(branch, revision, alias=False):
         branches[branch] = SnapshotBranchInfo(
             name=branch,
             alias=alias,
             revision=revision["id"],
             directory=revision["directory"],
             date=format_utc_iso_date(revision["date"]),
             message=revision["message"],
             url=None,
         )
 
     releases_info = archive.lookup_release_multiple(release_to_branch.keys())
     for release in releases_info:
         if release is None:
             continue
         branches_to_update = release_to_branch[release["id"]]
         for branch in branches_to_update:
             _add_release_info(branch, release)
         if release["target_type"] == "revision":
             revision_to_release[release["target"]].update(branches_to_update)
 
     revisions = archive.lookup_revision_multiple(
         set(revision_to_branch.keys()) | set(revision_to_release.keys())
     )
 
     for revision in revisions:
         if not revision:
             continue
         for branch in revision_to_branch[revision["id"]]:
             _add_branch_info(branch, revision)
         for release_id in revision_to_release[revision["id"]]:
             releases[release_id]["directory"] = revision["directory"]
 
     resolved_aliases = {}
 
     for branch_alias, branch_target in branch_aliases.items():
         resolved_alias = archive.lookup_snapshot_alias(snapshot["id"], branch_alias)
         resolved_aliases[branch_alias] = resolved_alias
         if resolved_alias is None:
             continue
 
         target_type = resolved_alias["target_type"]
         target = resolved_alias["target"]
 
         if target_type == "revision":
             revision = archive.lookup_revision(target)
             _add_branch_info(branch_alias, revision, alias=True)
         elif target_type == "release":
             release = archive.lookup_release(target)
             _add_release_info(branch_alias, release, alias=True)
 
         if branch_alias in branches:
             branches[branch_alias]["name"] = branch_alias
 
     ret_branches = list(sorted(branches.values(), key=lambda b: b["name"]))
     ret_releases = list(sorted(releases.values(), key=lambda b: b["name"]))
 
     return ret_branches, ret_releases, resolved_aliases
 
 
 @django_cache()
 def get_snapshot_content(
     snapshot_id: str,
 ) -> Tuple[List[SnapshotBranchInfo], List[SnapshotReleaseInfo], Dict[str, Any]]:
     """Returns the lists of branches and releases
     associated to a swh snapshot.
     That list is put in  cache in order to speedup the navigation
     in the swh-web/browse ui.
 
     .. warning:: At most 1000 branches contained in the snapshot
         will be returned for performance reasons.
 
     Args:
         snapshot_id: hexadecimal representation of the snapshot identifier
 
     Returns:
         A tuple with three members. The first one is a list of dict describing
         the snapshot branches. The second one is a list of dict describing the
         snapshot releases. The third one is a dict mapping resolved branch
         aliases to their real target.
 
     Raises:
         NotFoundExc if the snapshot does not exist
     """
 
     branches: List[SnapshotBranchInfo] = []
     releases: List[SnapshotReleaseInfo] = []
     aliases: Dict[str, Any] = {}
 
     snapshot_content_max_size = get_config()["snapshot_content_max_size"]
 
     if snapshot_id:
         snapshot = archive.lookup_snapshot(
             snapshot_id, branches_count=snapshot_content_max_size
         )
         branches, releases, aliases = process_snapshot_branches(snapshot)
 
     return branches, releases, aliases
 
 
 def get_origin_visit_snapshot(
     origin_info: OriginInfo,
     visit_ts: Optional[str] = None,
     visit_id: Optional[int] = None,
     snapshot_id: Optional[str] = None,
 ) -> Tuple[List[SnapshotBranchInfo], List[SnapshotReleaseInfo], Dict[str, Any]]:
     """Returns the lists of branches and releases associated to an origin for
     a given visit.
 
     The visit is expressed by either:
 
         * a snapshot identifier
         * a timestamp, if no visit with that exact timestamp is found,
           the closest one from the provided timestamp will be used.
 
     If no visit parameter is provided, it returns the list of branches
     found for the latest visit.
 
     That list is put in  cache in order to speedup the navigation
     in the swh-web/browse ui.
 
     .. warning:: At most 1000 branches contained in the snapshot
         will be returned for performance reasons.
 
     Args:
         origin_info: a dict filled with origin information
         visit_ts: an ISO 8601 datetime string to parse
         visit_id: visit id for disambiguation in case several visits have
             the same timestamp
         snapshot_id: if provided, visit associated to the snapshot will be processed
 
     Returns:
         A tuple with three members. The first one is a list of dict describing
         the origin branches for the given visit.
         The second one is a list of dict describing the origin releases
         for the given visit. The third one is a dict mapping resolved branch
         aliases to their real target.
 
     Raises:
         NotFoundExc if the origin or its visit are not found
     """
 
     visit_info = get_origin_visit(origin_info, visit_ts, visit_id, snapshot_id)
 
     return get_snapshot_content(visit_info["snapshot"])
 
 
 def get_snapshot_context(
     snapshot_id: Optional[str] = None,
     origin_url: Optional[str] = None,
     timestamp: Optional[str] = None,
     visit_id: Optional[int] = None,
     branch_name: Optional[str] = None,
     release_name: Optional[str] = None,
     revision_id: Optional[str] = None,
     path: Optional[str] = None,
     browse_context: str = "directory",
 ) -> SnapshotContext:
     """
     Utility function to compute relevant information when navigating
     the archive in a snapshot context. The snapshot is either
     referenced by its id or it will be retrieved from an origin visit.
 
     Args:
         snapshot_id: hexadecimal representation of a snapshot identifier
         origin_url: an origin_url
         timestamp: a datetime string for retrieving the closest
             visit of the origin
         visit_id: optional visit id for disambiguation in case
             of several visits with the same timestamp
         branch_name: optional branch name set when browsing the snapshot in
             that scope (will default to "HEAD" if not provided)
         release_name: optional release name set when browsing the snapshot in
             that scope
         revision_id: optional revision identifier set when browsing the snapshot in
             that scope
         path: optional path of the object currently browsed in the snapshot
         browse_context: indicates which type of object is currently browsed
 
     Returns:
         A dict filled with snapshot context information.
 
     Raises:
         swh.web.utils.exc.NotFoundExc: if no snapshot is found for the visit
             of an origin.
     """
     assert origin_url is not None or snapshot_id is not None
     origin_info = None
     visit_info = None
     url_args = {}
     query_params: Dict[str, Any] = {}
     origin_visits_url = None
 
     if origin_url:
 
         if visit_id is not None:
             query_params["visit_id"] = visit_id
         elif snapshot_id is not None:
             query_params["snapshot"] = snapshot_id
 
         origin_info = archive.lookup_origin({"url": origin_url})
 
         visit_info = get_origin_visit(origin_info, timestamp, visit_id, snapshot_id)
         formatted_date = format_utc_iso_date(visit_info["date"])
         visit_info["formatted_date"] = formatted_date
         snapshot_id = visit_info["snapshot"]
 
         if not snapshot_id:
             raise NotFoundExc(
                 "No snapshot associated to the visit of origin "
                 "%s on %s" % (escape(origin_url), formatted_date)
             )
 
         # provided timestamp is not necessarily equals to the one
         # of the retrieved visit, so get the exact one in order
         # to use it in the urls generated below
         if timestamp:
             timestamp = visit_info["date"]
 
         branches, releases, aliases = get_origin_visit_snapshot(
             origin_info, timestamp, visit_id, snapshot_id
         )
 
         query_params["origin_url"] = origin_info["url"]
 
         origin_visits_url = reverse(
             "browse-origin-visits", query_params={"origin_url": origin_info["url"]}
         )
 
         if timestamp is not None:
             query_params["timestamp"] = format_utc_iso_date(
                 timestamp, "%Y-%m-%dT%H:%M:%SZ"
             )
 
         visit_url = reverse("browse-origin-directory", query_params=query_params)
         visit_info["url"] = directory_url = visit_url
 
         branches_url = reverse("browse-origin-branches", query_params=query_params)
 
         releases_url = reverse("browse-origin-releases", query_params=query_params)
     else:
         assert snapshot_id is not None
         branches, releases, aliases = get_snapshot_content(snapshot_id)
         url_args = {"snapshot_id": snapshot_id}
         directory_url = reverse("browse-snapshot-directory", url_args=url_args)
         branches_url = reverse("browse-snapshot-branches", url_args=url_args)
 
         releases_url = reverse("browse-snapshot-releases", url_args=url_args)
 
     releases = list(reversed(releases))
 
     @django_cache()
     def _get_snapshot_sizes(snapshot_id):
         return archive.lookup_snapshot_sizes(snapshot_id)
 
     snapshot_sizes = _get_snapshot_sizes(snapshot_id)
 
     is_empty = (snapshot_sizes["release"] + snapshot_sizes["revision"]) == 0
 
     swh_snp_id = str(
         CoreSWHID(object_type=ObjectType.SNAPSHOT, object_id=hash_to_bytes(snapshot_id))
     )
 
     if visit_info:
         timestamp = format_utc_iso_date(visit_info["date"])
 
     if origin_info:
         browse_view_name = f"browse-origin-{browse_context}"
     else:
         browse_view_name = f"browse-snapshot-{browse_context}"
 
     release_id = None
     root_directory = None
 
     snapshot_total_size = snapshot_sizes["release"] + snapshot_sizes["revision"]
 
     if path is not None:
         query_params["path"] = path
 
     if snapshot_total_size and revision_id is not None:
         # browse specific revision for a snapshot requested
         revision = archive.lookup_revision(revision_id)
         root_directory = revision["directory"]
         branches.append(
             SnapshotBranchInfo(
                 name=revision_id,
                 alias=False,
                 revision=revision_id,
                 directory=root_directory,
                 date=revision["date"],
                 message=revision["message"],
                 url=None,
             )
         )
         query_params["revision"] = revision_id
     elif snapshot_total_size and release_name:
         # browse specific release for a snapshot requested
         release = _get_release(releases, release_name, snapshot_id)
         if release is None:
             _branch_not_found(
                 "release",
                 release_name,
                 snapshot_id,
                 snapshot_sizes,
                 origin_info,
                 timestamp,
                 visit_id,
             )
         else:
             if release["target_type"] == "revision":
                 revision = archive.lookup_revision(release["target"])
                 root_directory = revision["directory"]
                 revision_id = release["target"]
             elif release["target_type"] == "directory":
                 root_directory = release["target"]
             release_id = release["id"]
             query_params["release"] = release_name
     elif snapshot_total_size:
         head = aliases.get("HEAD")
         if branch_name:
             # browse specific branch for a snapshot requested
             query_params["branch"] = branch_name
             branch = _get_branch(branches, branch_name, snapshot_id)
             if branch is None:
                 _branch_not_found(
                     "branch",
                     branch_name,
                     snapshot_id,
                     snapshot_sizes,
                     origin_info,
                     timestamp,
                     visit_id,
                 )
             else:
                 branch_name = branch["name"]
                 revision_id = branch["revision"]
                 root_directory = branch["directory"]
         elif head is not None:
             # otherwise, browse branch targeted by the HEAD alias if it exists
             if head["target_type"] == "revision":
                 # HEAD alias targets a revision
                 head_rev = archive.lookup_revision(head["target"])
                 branch_name = "HEAD"
                 revision_id = head_rev["id"]
                 root_directory = head_rev["directory"]
             else:
                 # HEAD alias targets a release
                 release_name = archive.lookup_release(head["target"])["name"]
                 head_rel = _get_release(releases, release_name, snapshot_id)
                 if head_rel is None:
                     _branch_not_found(
                         "release",
                         str(release_name),
                         snapshot_id,
                         snapshot_sizes,
                         origin_info,
                         timestamp,
                         visit_id,
                     )
                 elif head_rel["target_type"] == "revision":
                     revision = archive.lookup_revision(head_rel["target"])
                     root_directory = revision["directory"]
                     revision_id = head_rel["target"]
                 elif head_rel["target_type"] == "directory":
                     root_directory = head_rel["target"]
                 if head_rel is not None:
                     release_id = head_rel["id"]
         elif branches:
             # fallback to browse first branch otherwise
             branch = branches[0]
             branch_name = branch["name"]
             revision_id = branch["revision"]
             root_directory = branch["directory"]
         elif releases:
             # fallback to browse last release otherwise
             release = releases[-1]
             if release["target_type"] == "revision":
                 revision = archive.lookup_revision(release["target"])
                 root_directory = revision["directory"]
                 revision_id = release["target"]
             elif release["target_type"] == "directory":
                 root_directory = release["target"]
             release_id = release["id"]
             release_name = release["name"]
 
     for b in branches:
         branch_query_params = dict(query_params)
         branch_query_params.pop("release", None)
         if b["name"] != b["revision"]:
             branch_query_params.pop("revision", None)
             branch_query_params["branch"] = b["name"]
         b["url"] = reverse(
             browse_view_name, url_args=url_args, query_params=branch_query_params
         )
 
     for r in releases:
         release_query_params = dict(query_params)
         release_query_params.pop("branch", None)
         release_query_params.pop("revision", None)
         release_query_params["release"] = r["name"]
         r["url"] = reverse(
             browse_view_name,
             url_args=url_args,
             query_params=release_query_params,
         )
 
     revision_info = None
     if revision_id:
         try:
             revision_info = archive.lookup_revision(revision_id)
         except NotFoundExc:
             pass
         else:
             revision_info["date"] = format_utc_iso_date(revision_info["date"])
             revision_info["committer_date"] = format_utc_iso_date(
                 revision_info["committer_date"]
             )
             if revision_info["message"]:
                 message_lines = revision_info["message"].split("\n")
                 revision_info["message_header"] = message_lines[0]
             else:
                 revision_info["message_header"] = ""
 
     snapshot_context = SnapshotContext(
         directory_url=directory_url,
         branch=branch_name,
         branch_alias=branch_name in aliases,
         branches=branches,
         branches_url=branches_url,
         is_empty=is_empty,
         origin_info=origin_info,
         origin_visits_url=origin_visits_url,
         release=release_name,
         release_alias=release_name in aliases,
         release_id=release_id,
         query_params=query_params,
         releases=releases,
         releases_url=releases_url,
         revision_id=revision_id,
         revision_info=revision_info,
         root_directory=root_directory,
         snapshot_id=snapshot_id,
         snapshot_sizes=snapshot_sizes,
         snapshot_swhid=swh_snp_id,
         url_args=url_args,
         visit_info=visit_info,
     )
 
     if revision_info:
         revision_info["revision_url"] = gen_revision_url(
             revision_info["id"], snapshot_context
         )
 
     return snapshot_context
 
 
 def _build_breadcrumbs(
     snapshot_context: SnapshotContext, path: Optional[str]
 ) -> List[Dict[str, str]]:
     origin_info = snapshot_context["origin_info"]
     url_args = snapshot_context["url_args"]
     query_params = dict(snapshot_context["query_params"])
     root_directory = snapshot_context["root_directory"]
 
     path_info = gen_path_info(path)
 
     if origin_info:
         browse_view_name = "browse-origin-directory"
     else:
         browse_view_name = "browse-snapshot-directory"
 
     breadcrumbs = []
     if root_directory:
         query_params.pop("path", None)
         breadcrumbs.append(
             {
                 "name": root_directory[:7],
                 "url": reverse(
                     browse_view_name, url_args=url_args, query_params=query_params
                 ),
             }
         )
     for pi in path_info:
         query_params["path"] = pi["path"]
         breadcrumbs.append(
             {
                 "name": pi["name"],
                 "url": reverse(
                     browse_view_name, url_args=url_args, query_params=query_params
                 ),
             }
         )
     return breadcrumbs
 
 
 def _check_origin_url(snapshot_id: Optional[str], origin_url: Optional[str]) -> None:
     if snapshot_id is None and origin_url is None:
         raise BadInputExc("An origin URL must be provided as query parameter.")
 
 
 def browse_snapshot_directory(
     request: HttpRequest,
     snapshot_id: Optional[str] = None,
     origin_url: Optional[str] = None,
     timestamp: Optional[str] = None,
     path: Optional[str] = None,
 ) -> HttpResponse:
     """
     Django view implementation for browsing a directory in a snapshot context.
     """
     _check_origin_url(snapshot_id, origin_url)
 
     visit_id = int(request.GET.get("visit_id", 0))
     snapshot_context = get_snapshot_context(
         snapshot_id=snapshot_id,
         origin_url=origin_url,
         timestamp=timestamp,
         visit_id=visit_id or None,
         path=path,
         browse_context="directory",
         branch_name=request.GET.get("branch"),
         release_name=request.GET.get("release"),
         revision_id=request.GET.get("revision"),
     )
 
     root_directory = snapshot_context["root_directory"]
     sha1_git = root_directory
     error_info: Dict[str, Any] = {
         "status_code": 200,
         "description": None,
     }
     if root_directory and path:
         try:
             dir_info = archive.lookup_directory_with_path(root_directory, path)
             sha1_git = dir_info["target"]
         except NotFoundExc as e:
             sha1_git = None
             error_info["status_code"] = 404
             error_info["description"] = f"NotFoundExc: {str(e)}"
 
     dirs = []
     files = []
     if sha1_git:
         dirs, files = get_directory_entries(sha1_git)
 
     origin_info = snapshot_context["origin_info"]
     visit_info = snapshot_context["visit_info"]
     url_args = snapshot_context["url_args"]
     query_params = dict(snapshot_context["query_params"])
     revision_id = snapshot_context["revision_id"]
     snapshot_id = snapshot_context["snapshot_id"]
 
     if origin_info:
         browse_view_name = "browse-origin-directory"
     else:
         browse_view_name = "browse-snapshot-directory"
 
     breadcrumbs = _build_breadcrumbs(snapshot_context, path)
 
     path = "" if path is None else (path + "/")
 
     for d in dirs:
         if d["type"] == "rev":
             d["url"] = reverse("browse-revision", url_args={"sha1_git": d["target"]})
         else:
             query_params["path"] = path + d["name"]
             d["url"] = reverse(
                 browse_view_name, url_args=url_args, query_params=query_params
             )
 
     sum_file_sizes = 0
 
     readmes = {}
 
     if origin_info:
         browse_view_name = "browse-origin-content"
     else:
         browse_view_name = "browse-snapshot-content"
 
     for f in files:
         query_params["path"] = path + f["name"]
         f["url"] = reverse(
             browse_view_name, url_args=url_args, query_params=query_params
         )
         if f["length"] is not None:
             sum_file_sizes += f["length"]
         if f["name"].lower().startswith("readme"):
             readmes[f["name"]] = f["checksums"]["sha1"]
 
     readme_name, readme_url, readme_html = get_readme_to_display(readmes)
 
     if origin_info:
         browse_view_name = "browse-origin-log"
     else:
         browse_view_name = "browse-snapshot-log"
 
     history_url = None
     if snapshot_id != _empty_snapshot_id:
         query_params.pop("path", None)
         history_url = reverse(
             browse_view_name, url_args=url_args, query_params=query_params
         )
 
     nb_files = None
     nb_dirs = None
     dir_path = None
     if root_directory:
         nb_files = len(files)
         nb_dirs = len(dirs)
         dir_path = "/" + path
 
     swh_objects = []
     vault_cooking: Dict[str, Any] = {
         "directory_context": False,
         "directory_swhid": None,
         "revision_context": False,
         "revision_swhid": None,
     }
     revision_found = False
 
     if revision_id is not None:
         try:
             archive.lookup_revision(revision_id)
         except NotFoundExc:
             pass
         else:
             revision_found = True
 
     if sha1_git is not None:
         swh_objects.append(
             SWHObjectInfo(object_type=ObjectType.DIRECTORY, object_id=sha1_git)
         )
         vault_cooking.update(
             {
                 "directory_context": True,
                 "directory_swhid": f"swh:1:dir:{sha1_git}",
             }
         )
     if revision_id is not None and revision_found:
         swh_objects.append(
             SWHObjectInfo(object_type=ObjectType.REVISION, object_id=revision_id)
         )
         vault_cooking.update(
             {
                 "revision_context": True,
                 "revision_swhid": f"swh:1:rev:{revision_id}",
             }
         )
     swh_objects.append(
         SWHObjectInfo(object_type=ObjectType.SNAPSHOT, object_id=snapshot_id)
     )
 
     visit_date = None
     visit_type = None
     if visit_info:
         visit_date = format_utc_iso_date(visit_info["date"])
         visit_type = visit_info["type"]
 
     release_id = snapshot_context["release_id"]
     if release_id:
         swh_objects.append(
             SWHObjectInfo(object_type=ObjectType.RELEASE, object_id=release_id)
         )
 
     dir_metadata = DirectoryMetadata(
         object_type=ObjectType.DIRECTORY,
         object_id=sha1_git,
         directory=sha1_git,
         nb_files=nb_files,
         nb_dirs=nb_dirs,
         sum_file_sizes=sum_file_sizes,
         root_directory=root_directory,
         path=dir_path,
         revision=revision_id,
         revision_found=revision_found,
         release=release_id,
         snapshot=snapshot_id,
         origin_url=origin_url,
         visit_date=visit_date,
         visit_type=visit_type,
     )
 
     swhids_info = get_swhids_info(swh_objects, snapshot_context, dir_metadata)
 
     dir_path = "/".join([bc["name"] for bc in breadcrumbs]) + "/"
     context_found = "snapshot: %s" % snapshot_context["snapshot_id"]
     if origin_info:
         context_found = "origin: %s" % origin_info["url"]
     heading = "Directory - %s - %s - %s" % (
         dir_path,
         snapshot_context["branch"],
         context_found,
     )
 
     top_right_link = None
     if not snapshot_context["is_empty"] and revision_found:
         top_right_link = {
             "url": history_url,
             "icon": swh_object_icons["revisions history"],
             "text": "History",
         }
 
     return render(
         request,
-        "browse/directory.html",
+        "browse-directory.html",
         {
             "heading": heading,
             "swh_object_name": "Directory",
             "swh_object_metadata": dir_metadata,
             "dirs": dirs,
             "files": files,
             "breadcrumbs": breadcrumbs if root_directory else [],
             "top_right_link": top_right_link,
             "readme_name": readme_name,
             "readme_url": readme_url,
             "readme_html": readme_html,
             "snapshot_context": snapshot_context,
             "vault_cooking": vault_cooking,
             "show_actions": True,
             "swhids_info": swhids_info,
             "error_code": error_info["status_code"],
             "error_message": http_status_code_message.get(error_info["status_code"]),
             "error_description": error_info["description"],
         },
         status=error_info["status_code"],
     )
 
 
 PER_PAGE = 100
 
 
 def browse_snapshot_log(
     request: HttpRequest,
     snapshot_id: Optional[str] = None,
     origin_url: Optional[str] = None,
     timestamp: Optional[str] = None,
 ) -> HttpResponse:
     """
     Django view implementation for browsing a revision history in a
     snapshot context.
     """
     _check_origin_url(snapshot_id, origin_url)
 
     visit_id = int(request.GET.get("visit_id", 0))
     snapshot_context = get_snapshot_context(
         snapshot_id=snapshot_id,
         origin_url=origin_url,
         timestamp=timestamp,
         visit_id=visit_id or None,
         browse_context="log",
         branch_name=request.GET.get("branch"),
         release_name=request.GET.get("release"),
         revision_id=request.GET.get("revision"),
     )
 
     revision_id = snapshot_context["revision_id"]
 
     if revision_id is None:
         raise NotFoundExc("No revisions history found in the current snapshot context.")
 
     per_page = int(request.GET.get("per_page", PER_PAGE))
     offset = int(request.GET.get("offset", 0))
     revs_ordering = request.GET.get("revs_ordering", "committer_date")
     session_key = "rev_%s_log_ordering_%s" % (revision_id, revs_ordering)
     rev_log_session = request.session.get(session_key, None)
     rev_log = []
     revs_walker_state = None
     if rev_log_session:
         rev_log = rev_log_session["rev_log"]
         revs_walker_state = rev_log_session["revs_walker_state"]
 
     if len(rev_log) < offset + per_page:
         revs_walker = archive.get_revisions_walker(
             revs_ordering,
             revision_id,
             max_revs=offset + per_page + 1,
             state=revs_walker_state,
         )
         rev_log += [rev["id"] for rev in revs_walker]
         revs_walker_state = revs_walker.export_state()
 
     revs = rev_log[offset : offset + per_page]
     revision_log = archive.lookup_revision_multiple(revs)
 
     request.session[session_key] = {
         "rev_log": rev_log,
         "revs_walker_state": revs_walker_state,
     }
 
     origin_info = snapshot_context["origin_info"]
     visit_info = snapshot_context["visit_info"]
     url_args = snapshot_context["url_args"]
     query_params = snapshot_context["query_params"]
     snapshot_id = snapshot_context["snapshot_id"]
 
     query_params["per_page"] = str(per_page)
     revs_ordering = request.GET.get("revs_ordering", "")
     if revs_ordering:
         query_params["revs_ordering"] = revs_ordering
 
     if origin_info:
         browse_view_name = "browse-origin-log"
     else:
         browse_view_name = "browse-snapshot-log"
 
     prev_log_url = None
     if len(rev_log) > offset + per_page:
         query_params["offset"] = str(offset + per_page)
         prev_log_url = reverse(
             browse_view_name, url_args=url_args, query_params=query_params
         )
 
     next_log_url = None
     if offset != 0:
         query_params["offset"] = str(offset - per_page)
         next_log_url = reverse(
             browse_view_name, url_args=url_args, query_params=query_params
         )
 
     revision_log_data = format_log_entries(revision_log, per_page, snapshot_context)
 
     browse_rev_link = gen_revision_link(revision_id)
 
     browse_log_link = gen_revision_log_link(revision_id)
 
     browse_snp_link = gen_snapshot_link(snapshot_id)
 
     revision_metadata = {
         "context-independent revision": browse_rev_link,
         "context-independent revision history": browse_log_link,
         "context-independent snapshot": browse_snp_link,
         "snapshot": snapshot_id,
     }
 
     if origin_info and visit_info:
         revision_metadata["origin url"] = origin_info["url"]
         revision_metadata["origin visit date"] = format_utc_iso_date(visit_info["date"])
         revision_metadata["origin visit type"] = visit_info["type"]
 
     swh_objects = [
         SWHObjectInfo(object_type=ObjectType.REVISION, object_id=revision_id),
         SWHObjectInfo(object_type=ObjectType.SNAPSHOT, object_id=snapshot_id),
     ]
 
     release_id = snapshot_context["release_id"]
     if release_id:
         swh_objects.append(
             SWHObjectInfo(object_type=ObjectType.RELEASE, object_id=release_id)
         )
         browse_rel_link = gen_release_link(release_id)
         revision_metadata["release"] = release_id
         revision_metadata["context-independent release"] = browse_rel_link
 
     swhids_info = get_swhids_info(swh_objects, snapshot_context)
 
     context_found = "snapshot: %s" % snapshot_context["snapshot_id"]
     if origin_info:
         context_found = "origin: %s" % origin_info["url"]
     heading = "Revision history - %s - %s" % (snapshot_context["branch"], context_found)
 
     return render(
         request,
-        "browse/revision-log.html",
+        "browse-revision-log.html",
         {
             "heading": heading,
             "swh_object_name": "Revisions history",
             "swh_object_metadata": revision_metadata,
             "revision_log": revision_log_data,
             "revs_ordering": revs_ordering,
             "next_log_url": next_log_url,
             "prev_log_url": prev_log_url,
             "breadcrumbs": None,
             "top_right_link": None,
             "snapshot_context": snapshot_context,
             "vault_cooking": None,
             "show_actions": True,
             "swhids_info": swhids_info,
         },
     )
 
 
 def browse_snapshot_branches(
     request: HttpRequest,
     snapshot_id: Optional[str] = None,
     origin_url: Optional[str] = None,
     timestamp: Optional[str] = None,
     branch_name_include: Optional[str] = None,
 ) -> HttpResponse:
     """
     Django view implementation for browsing a list of branches in a snapshot
     context.
     """
     _check_origin_url(snapshot_id, origin_url)
 
     visit_id = int(request.GET.get("visit_id", 0))
     snapshot_context = get_snapshot_context(
         snapshot_id=snapshot_id,
         origin_url=origin_url,
         timestamp=timestamp,
         visit_id=visit_id or None,
     )
 
     branches_bc_str = request.GET.get("branches_breadcrumbs", "")
     branches_bc = branches_bc_str.split(",") if branches_bc_str else []
     branches_from = branches_bc[-1] if branches_bc else ""
 
     origin_info = snapshot_context["origin_info"]
     url_args = snapshot_context["url_args"]
     query_params = snapshot_context["query_params"]
 
     if origin_info:
         browse_view_name = "browse-origin-directory"
     else:
         browse_view_name = "browse-snapshot-directory"
 
     snapshot = archive.lookup_snapshot(
         snapshot_context["snapshot_id"],
         branches_from,
         PER_PAGE + 1,
         target_types=["revision", "alias"],
         branch_name_include_substring=branch_name_include,
     )
     displayed_branches: List[Dict[str, Any]] = []
     if snapshot:
         branches, _, _ = process_snapshot_branches(snapshot)
         displayed_branches = [dict(branch) for branch in branches]
 
     for branch in displayed_branches:
         rev_query_params = {}
         if origin_info:
             rev_query_params["origin_url"] = origin_info["url"]
 
         revision_url = reverse(
             "browse-revision",
             url_args={"sha1_git": branch["revision"]},
             query_params=query_params,
         )
 
         query_params["branch"] = branch["name"]
         directory_url = reverse(
             browse_view_name, url_args=url_args, query_params=query_params
         )
         del query_params["branch"]
         branch["revision_url"] = revision_url
         branch["directory_url"] = directory_url
 
     if origin_info:
         browse_view_name = "browse-origin-branches"
     else:
         browse_view_name = "browse-snapshot-branches"
 
     prev_branches_url = None
     next_branches_url = None
 
     if branches_bc:
         query_params_prev = dict(query_params)
 
         query_params_prev["branches_breadcrumbs"] = ",".join(branches_bc[:-1])
         prev_branches_url = reverse(
             browse_view_name, url_args=url_args, query_params=query_params_prev
         )
     elif branches_from:
         prev_branches_url = reverse(
             browse_view_name, url_args=url_args, query_params=query_params
         )
 
     if snapshot and snapshot["next_branch"] is not None:
         query_params_next = dict(query_params)
         next_branch = displayed_branches[-1]["name"]
         del displayed_branches[-1]
         branches_bc.append(next_branch)
         query_params_next["branches_breadcrumbs"] = ",".join(branches_bc)
         next_branches_url = reverse(
             browse_view_name, url_args=url_args, query_params=query_params_next
         )
 
     heading = "Branches - "
     if origin_info:
         heading += "origin: %s" % origin_info["url"]
     else:
         heading += "snapshot: %s" % snapshot_id
 
     return render(
         request,
-        "browse/branches.html",
+        "browse-branches.html",
         {
             "heading": heading,
             "swh_object_name": "Branches",
             "swh_object_metadata": {},
             "top_right_link": None,
             "displayed_branches": displayed_branches,
             "prev_branches_url": prev_branches_url,
             "next_branches_url": next_branches_url,
             "snapshot_context": snapshot_context,
             "search_string": branch_name_include or "",
         },
     )
 
 
 def browse_snapshot_releases(
     request: HttpRequest,
     snapshot_id: Optional[str] = None,
     origin_url: Optional[str] = None,
     timestamp: Optional[str] = None,
     release_name_include: Optional[str] = None,
 ):
     """
     Django view implementation for browsing a list of releases in a snapshot
     context.
     """
     _check_origin_url(snapshot_id, origin_url)
 
     visit_id = int(request.GET.get("visit_id", 0))
     snapshot_context = get_snapshot_context(
         snapshot_id=snapshot_id,
         origin_url=origin_url,
         timestamp=timestamp,
         visit_id=visit_id or None,
     )
 
     rel_bc_str = request.GET.get("releases_breadcrumbs", "")
     rel_bc = rel_bc_str.split(",") if rel_bc_str else []
     rel_from = rel_bc[-1] if rel_bc else ""
 
     origin_info = snapshot_context["origin_info"]
     url_args = snapshot_context["url_args"]
     query_params = snapshot_context["query_params"]
 
     snapshot = archive.lookup_snapshot(
         snapshot_context["snapshot_id"],
         rel_from,
         PER_PAGE + 1,
         target_types=["release", "alias"],
         branch_name_include_substring=release_name_include,
     )
     displayed_releases: List[Dict[str, Any]] = []
     if snapshot:
         _, releases, _ = process_snapshot_branches(snapshot)
         displayed_releases = [dict(release) for release in releases]
 
     for release in displayed_releases:
         query_params_tgt = {"snapshot": snapshot_id, "release": release["name"]}
         if origin_info:
             query_params_tgt["origin_url"] = origin_info["url"]
 
         release_url = reverse(
             "browse-release",
             url_args={"sha1_git": release["id"]},
             query_params=query_params_tgt,
         )
 
         target_url = ""
         tooltip = (
             f"The release {release['name']} targets "
             f"{release['target_type']} {release['target']}"
         )
         if release["target_type"] == "revision":
             target_url = reverse(
                 "browse-revision",
                 url_args={"sha1_git": release["target"]},
                 query_params=query_params_tgt,
             )
         elif release["target_type"] == "directory":
             target_url = reverse(
                 "browse-directory",
                 url_args={"sha1_git": release["target"]},
                 query_params=query_params_tgt,
             )
         elif release["target_type"] == "content":
             target_url = reverse(
                 "browse-content",
                 url_args={"query_string": release["target"]},
                 query_params=query_params_tgt,
             )
         elif release["target_type"] == "release":
             target_url = reverse(
                 "browse-release",
                 url_args={"sha1_git": release["target"]},
                 query_params=query_params_tgt,
             )
             tooltip = (
                 f"The release {release['name']} "
                 f"is an alias for release {release['target']}"
             )
 
         release["release_url"] = release_url
         release["target_url"] = target_url
         release["tooltip"] = tooltip
 
     if origin_info:
         browse_view_name = "browse-origin-releases"
     else:
         browse_view_name = "browse-snapshot-releases"
 
     prev_releases_url = None
     next_releases_url = None
 
     if rel_bc:
         query_params_prev = dict(query_params)
 
         query_params_prev["releases_breadcrumbs"] = ",".join(rel_bc[:-1])
         prev_releases_url = reverse(
             browse_view_name, url_args=url_args, query_params=query_params_prev
         )
     elif rel_from:
         prev_releases_url = reverse(
             browse_view_name, url_args=url_args, query_params=query_params
         )
 
     if snapshot and snapshot["next_branch"] is not None:
         query_params_next = dict(query_params)
         next_rel = displayed_releases[-1]["branch_name"]
         del displayed_releases[-1]
         rel_bc.append(next_rel)
         query_params_next["releases_breadcrumbs"] = ",".join(rel_bc)
         next_releases_url = reverse(
             browse_view_name, url_args=url_args, query_params=query_params_next
         )
 
     heading = "Releases - "
     if origin_info:
         heading += "origin: %s" % origin_info["url"]
     else:
         heading += "snapshot: %s" % snapshot_id
 
     return render(
         request,
-        "browse/releases.html",
+        "browse-releases.html",
         {
             "heading": heading,
             "top_panel_visible": False,
             "top_panel_collapsible": False,
             "swh_object_name": "Releases",
             "swh_object_metadata": {},
             "top_right_link": None,
             "displayed_releases": displayed_releases,
             "prev_releases_url": prev_releases_url,
             "next_releases_url": next_releases_url,
             "snapshot_context": snapshot_context,
             "vault_cooking": None,
             "show_actions": False,
             "search_string": release_name_include or "",
         },
     )
diff --git a/swh/web/templates/browse/branches.html b/swh/web/browse/templates/browse-branches.html
similarity index 96%
rename from swh/web/templates/browse/branches.html
rename to swh/web/browse/templates/browse-branches.html
index ab84814b..7a01cf35 100644
--- a/swh/web/templates/browse/branches.html
+++ b/swh/web/browse/templates/browse-branches.html
@@ -1,87 +1,87 @@
 {% extends "./browse.html" %}
 
 {% comment %}
-Copyright (C) 2017-2019  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 
 {% load swh_templatetags %}
 
 {% block swh-browse-content %}
   <div class="table-responsive mt-3 mb-3">
     <div class="form-group row float-right">
-      {% include "includes/branch-search.html" %}
+      {% include "./includes/branch-search.html" %}
     </div>
     <table class="table swh-table swh-table-striped">
       <thead>
         <tr>
           <th><i class="{{ swh_object_icons.branch }} mdi-fw" aria-hidden="true"></i>Name</th>
           <th>Revision</th>
           <th>Message</th>
           <th>Date</th>
         </tr>
       </thead>
       <tbody>
         {% if displayed_branches|length > 0 %}
           {% for branch in displayed_branches %}
             <tr class="swh-branch-entry swh-tr-hover-highlight">
               <td class="swh-branch-name">
                 <a href="{{ branch.directory_url }}">
                   {% if branch.alias %}
                     <i class="{{ swh_object_icons.alias }} mdi-fw" aria-hidden="true"></i>
                   {% else %}
                     <i class="{{ swh_object_icons.branch }} mdi-fw" aria-hidden="true"></i>
                   {% endif %}
                   {{ branch.name }}
                 </a>
               </td>
               <td>
                 <a href="{{ branch.revision_url }}">
                   {{ branch.revision|slice:":7" }}
                 </a>
               </td>
               <td class="swh-branch-message swh-table-cell-text-overflow" title="{{ branch.message }}">
                 {{ branch.message }}
               </td>
               <td class="swh-branch-date">
                 {{ branch.date }}
               </td>
             </tr>
           {% endfor %}
         {% else %}
           <tr>
             <td>
               {% if search_string %}
                 No branch names containing {{search_string}} have been found!
               {% else %}
                 The list of branches is empty!
               {% endif %}
             </td>
           </tr>
         {% endif %}
       </tbody>
     </table>
   </div>
 {% endblock %}
 
 
 {% block swh-browse-after-content %}
   {% if prev_branches_url or next_branches_url %}
     <ul class="pagination justify-content-center">
       {% if prev_branches_url %}
         <li class="page-item"><a class="page-link" href="{{ prev_branches_url }}">Previous</a></li>
       {% else %}
         <li class="page-item disabled"><a class="page-link">Previous</a></li>
       {% endif %}
 
       {% if next_branches_url %}
         <li class="page-item"><a class="page-link" href="{{ next_branches_url }}">Next</a></li>
       {% else %}
         <li class="page-item disabled"><a class="page-link">Next</a></li>
       {% endif %}
     </ul>
   {% endif %}
 {% endblock %}
diff --git a/swh/web/templates/browse/content.html b/swh/web/browse/templates/browse-content.html
similarity index 66%
rename from swh/web/templates/browse/content.html
rename to swh/web/browse/templates/browse-content.html
index 9e06fde7..d20b27cf 100644
--- a/swh/web/templates/browse/content.html
+++ b/swh/web/browse/templates/browse-content.html
@@ -1,13 +1,13 @@
 {% extends "./browse.html" %}
 
 {% comment %}
-Copyright (C) 2017-2018  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% block swh-browse-content %}
-{% include "includes/top-navigation.html" %}
-{% include "includes/content-display.html" %}
+{% include "./includes/top-navigation.html" %}
+{% include "./includes/content-display.html" %}
 {% endblock %}
diff --git a/swh/web/templates/browse/directory.html b/swh/web/browse/templates/browse-directory.html
similarity index 63%
rename from swh/web/templates/browse/directory.html
rename to swh/web/browse/templates/browse-directory.html
index 7b35c76e..97818a4c 100644
--- a/swh/web/templates/browse/directory.html
+++ b/swh/web/browse/templates/browse-directory.html
@@ -1,17 +1,17 @@
 {% extends "./browse.html" %}
 
 {% comment %}
-Copyright (C) 2017-2018  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% block swh-browse-content %}
-{% include "includes/top-navigation.html" %}
-{% include "includes/directory-display.html" %}
+{% include "./includes/top-navigation.html" %}
+{% include "./includes/directory-display.html" %}
 {% endblock %}
 
 {% block swh-browse-after-content %}
-{% include "includes/readme-display.html" %}
+{% include "./includes/readme-display.html" %}
 {% endblock %}
diff --git a/swh/web/templates/browse/help.html b/swh/web/browse/templates/browse-help.html
similarity index 100%
rename from swh/web/templates/browse/help.html
rename to swh/web/browse/templates/browse-help.html
diff --git a/swh/web/templates/browse/origin-visits.html b/swh/web/browse/templates/browse-origin-visits.html
similarity index 100%
rename from swh/web/templates/browse/origin-visits.html
rename to swh/web/browse/templates/browse-origin-visits.html
diff --git a/swh/web/templates/browse/release.html b/swh/web/browse/templates/browse-release.html
similarity index 90%
rename from swh/web/templates/browse/release.html
rename to swh/web/browse/templates/browse-release.html
index 8bdbd55c..652c7474 100644
--- a/swh/web/templates/browse/release.html
+++ b/swh/web/browse/templates/browse-release.html
@@ -1,30 +1,30 @@
 {% extends "./browse.html" %}
 
 {% comment %}
-Copyright (C) 2017-2019  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 {% block swh-browse-content %}
-{% include "includes/top-navigation.html" %}
+{% include "./includes/top-navigation.html" %}
 <div style="height: 35px;margin: 4px;">
   <i class="{{ swh_object_icons.release }} mdi-fw" aria-hidden="true"></i>Release <b>{{ swh_object_metadata.name }}</b>
   created by {{ swh_object_metadata.author_url }} on <b>{{ swh_object_metadata.date }}</b>
 </div>
 <pre style="white-space: pre-wrap">
 <h6>{{ release.note_header }}</h6>{{ release.note_body }}
 </pre>
 <div style="margin: 4px;">
   <b>Target:</b> <i class="{{ swh_object_icons|key_value:release.target_type }} mdi-fw" aria-hidden="true"></i>
   {{ release.target_link}}
   {% if release.directory_link %}
     <br/>
     <b>Directory:</b> <i class="{{ swh_object_icons|key_value:'directory' }} mdi-fw" aria-hidden="true"></i>
     {{ release.directory_link}}
   {% endif %}
 </div>
 {% endblock %}
diff --git a/swh/web/templates/browse/releases.html b/swh/web/browse/templates/browse-releases.html
similarity index 96%
rename from swh/web/templates/browse/releases.html
rename to swh/web/browse/templates/browse-releases.html
index beb74425..8341336a 100644
--- a/swh/web/templates/browse/releases.html
+++ b/swh/web/browse/templates/browse-releases.html
@@ -1,85 +1,85 @@
 {% extends "./browse.html" %}
 
 {% comment %}
-Copyright (C) 2017-2021 The Software Heritage developers
+Copyright (C) 2017-2022 The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 {% block swh-browse-content %}
   <div class="table-responsive mt-3 mb-3">
     <div class="form-group row float-right">
-      {% include "includes/branch-search.html" %}
+      {% include "./includes/branch-search.html" %}
     </div>
     <table class="table swh-table swh-table-striped">
       <thead>
         <tr>
           <th><i class="{{ swh_object_icons.release }} mdi-fw" aria-hidden="true"></i>Name</th>
           <th>Target</th>
           <th>Message</th>
           <th>Date</th>
         </tr>
       </thead>
       <tbody>
         {% if displayed_releases|length > 0 %}
           {% for release in displayed_releases %}
             <tr class="swh-release-entry swh-tr-hover-highlight">
               <td class="swh-release-name">
                 <a href="{{ release.release_url }}">
                   {% if release.alias %}
                     <i class="{{ swh_object_icons.alias }} mdi-fw" aria-hidden="true"></i>
                   {% else %}
                     <i class="{{ swh_object_icons.release }} mdi-fw" aria-hidden="true"></i>
                   {% endif %}
                   {{ release.name }}
                 </a>
               </td>
               <td class="swh-release-target">
                 <a href="{{ release.target_url }}">
                   <i class="{{ swh_object_icons|key_value:release.target_type }} mdi-fw" aria-hidden="true" title="{{ release.tooltip }}"></i>{{ release.target|slice:":7" }}
                 </a>
               </td>
               <td class="swh-log-entry-message swh-release-message swh-table-cell-text-overflow" title="{{ release.message }}">
                 {{ release.message }}
               </td>
               <td class="swh-release-date">
                 {{ release.date }}
               </td>
             </tr>
           {% endfor %}
         {% else %}
           <tr>
             <td>
               {% if search_string %}
                 No release names containing {{search_string}} have been found!
               {% else %}
                 The list of releases is empty!
               {% endif %}
             </td>
           </tr>
         {% endif %}
       </tbody>
     </table>
   </div>
 {% endblock %}
 
 {% block swh-browse-after-content %}
   {% if prev_releases_url or next_releases_url %}
     <ul class="pagination justify-content-center">
       {% if prev_releases_url %}
         <li class="page-item"><a class="page-link" href="{{ prev_releases_url }}">Previous</a></li>
       {% else %}
         <li class="page-item disabled"><a class="page-link">Previous</a></li>
       {% endif %}
 
       {% if next_releases_url %}
         <li class="page-item"><a class="page-link" href="{{ next_releases_url }}">Next</a></li>
       {% else %}
         <li class="page-item disabled"><a class="page-link">Next</a></li>
       {% endif %}
     </ul>
   {% endif %}
 {% endblock %}
diff --git a/swh/web/templates/browse/revision-log.html b/swh/web/browse/templates/browse-revision-log.html
similarity index 96%
rename from swh/web/templates/browse/revision-log.html
rename to swh/web/browse/templates/browse-revision-log.html
index 8863d189..512a6c6a 100644
--- a/swh/web/templates/browse/revision-log.html
+++ b/swh/web/browse/templates/browse-revision-log.html
@@ -1,119 +1,119 @@
 {% extends "./browse.html" %}
 
 {% comment %}
-Copyright (C) 2017-2019  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load render_bundle from webpack_loader %}
 {% load swh_templatetags %}
 
 {% block header %}
 {{ block.super }}
 {% render_bundle 'revision' %}
 {% endblock %}
 
 {% block swh-browse-content %}
 {% if snapshot_context %}
-  {% include "includes/top-navigation.html" %}
+  {% include "./includes/top-navigation.html" %}
 {% endif %}
 
 {% if snapshot_context and snapshot_context.is_empty %}
-  {% include "includes/empty-snapshot.html" %}
+  {% include "./includes/empty-snapshot.html" %}
 {% else %}
 
   <hr class="mt-0 mb-0">
 
   <form class="text-center">
     sort by:
     <div class="custom-control custom-radio custom-control-inline" title="reverse chronological order">
       <input class="custom-control-input" type="radio" name="revs-ordering" id="revs-ordering-date"
             value="" onclick="swh.revision.revsOrderingTypeClicked(event)" checked>
       <label class="custom-control-label font-weight-normal" for="revs-ordering-date">revision date</label>
     </div>
     <div class="custom-control custom-radio custom-control-inline" title="pre-order, depth-first visit on the revision graph">
       <input class="custom-control-input" type="radio" name="revs-ordering" id="revs-ordering-dfs"
             value="dfs" onclick="swh.revision.revsOrderingTypeClicked(event)">
       <label class="custom-control-label font-weight-normal" for="revs-ordering-dfs">DFS</label>
     </div>
     <div class="custom-control custom-radio custom-control-inline" title="post-order, depth-first visit on the revision graph">
       <input class="custom-control-input" type="radio" name="revs-ordering" id="revs-ordering-dfs-post"
             value="dfs_post" onclick="swh.revision.revsOrderingTypeClicked(event)">
       <label class="custom-control-label font-weight-normal" for="revs-ordering-dfs-post">DFS post-ordering</label>
     </div>
     <div class="custom-control custom-radio custom-control-inline" title="breadth-first visit on the revision graph">
       <input class="custom-control-input" type="radio" name="revs-ordering" id="revs-ordering-bfs"
             value="bfs" onclick="swh.revision.revsOrderingTypeClicked(event)">
       <label class="custom-control-label font-weight-normal" for="revs-ordering-bfs">BFS</label>
     </div>
   </form>
 
   <div class="table-responsive mb-3">
     <table class="table swh-table swh-table-striped">
       <thead>
         <tr>
           <th><i class="{{ swh_object_icons.revision }} mdi-fw" aria-hidden="true"></i>Revision</th>
           <th>Author</th>
           <th>Date</th>
           <th>Message</th>
           <th>Commit Date</th>
         </tr>
       </thead>
       <tbody>
         {% for rev in revision_log %}
           <tr class="swh-revision-log-entry swh-tr-hover-highlight" title="{{ rev.tooltip }}">
             <td class="swh-revision-log-entry-id">
               <a href="{{ rev.url }}">
                 <i class="{{ swh_object_icons|key_value:'revision' }} mdi-fw" aria-hidden="true"></i>{{ rev.id }}
               </a>
             </td>
             <td class="swh-revision-log-entry-author">
               {{ rev.author }}
             </td>
             <td class="swh-revision-log-entry-date">
               {{ rev.date }}
             </td>
             <td class="swh-log-entry-message swh-table-cell-text-overflow">
               {{ rev.message }}
             </td>
             <td class="swh-revision-log-entry-commit-date">
               {{ rev.commit_date }}
             </td>
           </tr>
         {% endfor %}
       </tbody>
     </table>
   </div>
 
   <script>
     swh.revision.initRevisionsLog();
   </script>
 {% endif %}
 {% endblock %}
 
 {% block swh-browse-after-content %}
 {% if not snapshot_context or not snapshot_context.is_empty %}
   <ul class="pagination justify-content-center">
     {% if next_log_url %}
       <li class="page-item">
         <a class="page-link" href="{{ next_log_url }}">{% if revs_ordering %}Previous{% else %}Newer{% endif %}</a>
       </li>
     {% else %}
       <li class="page-item disabled">
         <a class="page-link">{% if revs_ordering %}Previous{% else %}Newer{% endif %}</a>
       </li>
     {% endif %}
     {% if prev_log_url %}
       <li class="page-item">
         <a class="page-link" href="{{ prev_log_url }}">{% if revs_ordering %}Next{% else %}Older{% endif %}</a>
       </li>
     {% else %}
       <li class="page-item disabled">
         <a class="page-link">{% if revs_ordering %}Next{% else %}Older{% endif %}</a>
       </li>
     {% endif %}
   </ul>
 {% endif %}
 {% endblock %}
diff --git a/swh/web/templates/browse/revision.html b/swh/web/browse/templates/browse-revision.html
similarity index 94%
rename from swh/web/templates/browse/revision.html
rename to swh/web/browse/templates/browse-revision.html
index 37c6fb10..34e80306 100644
--- a/swh/web/templates/browse/revision.html
+++ b/swh/web/browse/templates/browse-revision.html
@@ -1,111 +1,111 @@
 {% extends "./browse.html" %}
 
 {% comment %}
-Copyright (C) 2017-2019  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load static %}
 {% load swh_templatetags %}
 {% load render_bundle from webpack_loader %}
 
 {% block header %}
 {{ block.super }}
 {% render_bundle 'revision' %}
 {% endblock %}
 
 {% block swh-browse-content %}
 <div>
   <i class="{{ swh_object_icons|key_value:'revision' }} mdi-fw" aria-hidden="true"></i>Revision <b>{{ swh_object_metadata.revision }}</b>
   authored by {{ swh_object_metadata.author_url }} on <b>{{ swh_object_metadata.date }}</b>,
   committed by {{ swh_object_metadata.committer_url }} on <b>{{ swh_object_metadata.committer_date }}</b>
 </div>
 
 <div class="card">
   <div class="card-header bg-gray-light border-bottom-0" style="padding-left: 9.5px;">
     <a data-toggle="collapse" id="swh-collapse-revision-message" href="#swh-revision-message">
       <div class="float-left">
         <pre style="white-space: pre-wrap; background-color: inherit; padding: 0px; margin: 0px; border: none;"><h5 style="padding-bottom: 0px; font-weight: normal;">{{ message_header }}</h5></pre>
       </div>
       <div class="clearfix"></div>
     </a>
   </div>
   {% if message_body %}
     <div id="swh-revision-message" class="collapse show">
       <pre style="white-space: pre-wrap; margin: 0px; border: none; border-radius: 0px;">{{ message_body }}</pre>
     </div>
   {% endif %}
 </div>
 
 <div style="margin: 4px; padding-bottom: 5px;">
   <b>{{ parents|length }} parent{% if parents|length > 1 %}s{% endif %}</b>
   <i class="{{ swh_object_icons.revision }} mdi-fw" aria-hidden="true"></i>
   {% for parent in parents %}
     <a href="{{ parent.url }}">{{ parent.id|slice:":7" }}</a>
     {% if not forloop.last %}
       +
     {% endif %}
   {% endfor %}
 </div>
 
 <ul class="nav nav-tabs" style="padding-left: 5px;">
   <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#swh-revision-tree">Files</a></li>
   <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#swh-revision-changes">Changes</a></li>
 </ul>
 
 <div class="tab-content">
   <div id="swh-revision-tree" class="tab-pane active">
-    {% include "includes/top-navigation.html" %}
+    {% include "./includes/top-navigation.html" %}
     {% if content_size %}
-      {% include "includes/content-display.html" %}
+      {% include "./includes/content-display.html" %}
     {% else %}
-      {% include "includes/directory-display.html" %}
+      {% include "./includes/directory-display.html" %}
     {% endif %}
   </div>
 
   <div id="swh-revision-changes" class="tab-pane">
     <div id="swh-too-large-revision-diff" class="alert alert-warning" role="alert" style="display: none; margin: 5px 5px 0px 5px">
       The diff you're trying to view is too large. Only the first <span id="swh-nb-loaded-diffs">1000</span> changed files have been loaded.
     </div>
     <div id="swh-revision-diffs" style="padding: 5px; padding-bottom: 0;">
       <div class="card">
         <div class="card-header bg-gray-light border-bottom-0">
           <a data-toggle="collapse" href="#swh-revision-changes-list">
             <div class="float-left">
               Showing <strong id="swh-revision-changed-files"></strong>
               with <strong id="swh-revision-lines-added" style="color:green">0 additions</strong>
               and <strong id="swh-revision-lines-deleted" style="color:red">0 deletions</strong>
               (<span id="swh-nb-diffs-computed">0</span> / <span id="swh-total-nb-diffs">0</span> diffs computed)
             </div>
             <div class="float-right">
               <button class="btn btn-default btn-sm" type="button" onclick="swh.revision.computeAllDiffs(event)" id="swh-compute-all-diffs"
                       title="By default, diffs will be computed as the view is scrolled.
 Pushing that button will request the immediate computation of all diffs." style="visibility: hidden;">Compute all diffs</button>
             </div>
             <div class="clearfix"></div>
           </a>
         </div>
         <div id="swh-revision-changes-list" class="collapse show">
           <div id="swh-revision-changes-loading" class="text-center">
             <img src="{% static "img/swh-spinner.gif" %}"></img>
             <p>Computing file changes ...</p>
           </div>
           <pre style="background: none; border: none; display: none;"></pre>
         </div>
       </div>
     </div>
   </div>
 </div>
 
 <script>
   var revMsgBody = {{ message_body|jsonify }};
   var diffRevUrl = {{ diff_revision_url|jsonify }};
   swh.revision.initRevisionDiff(revMsgBody, diffRevUrl);
 </script>
 {% endblock %}
 
 {% block swh-browse-after-content %}
-{% include "includes/readme-display.html" %}
+{% include "./includes/readme-display.html" %}
 {% endblock %}
diff --git a/swh/web/templates/browse/search.html b/swh/web/browse/templates/browse-search.html
similarity index 90%
rename from swh/web/templates/browse/search.html
rename to swh/web/browse/templates/browse-search.html
index d557d2b1..42ff8d58 100644
--- a/swh/web/templates/browse/search.html
+++ b/swh/web/browse/templates/browse-search.html
@@ -1,52 +1,52 @@
-{% extends "./layout.html" %}
+{% extends "./browse.html" %}
 
 {% comment %}
-Copyright (C) 2017-2020  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load static %}
 
 {% block navbar-content %}
 <h4>Search archived software</h4>
 {% endblock %}
 
 {% block browse-content %}
 
-{% include "includes/origin-search-form.html" %}
+{% include "./includes/origin-search-form.html" %}
 <hr>
 <div id="swh-origin-search-results" class="mb-3" style="display: none;">
   <div class="table-responsive">
     <table class="table swh-table swh-table-striped" id="origin-search-results">
       <thead>
         <tr>
           <th>Origin type</th>
           <th>Origin url</th>
           <th>Archiving status</th>
         </tr>
       </thead>
       <tbody>
       </tbody>
     </table>
   </div>
 </div>
 <div class="swh-loading">
   <img src="{% static 'img/swh-spinner.gif' %}"></img>
   <p>Searching origins ...</p>
 </div>
 <p id="swh-no-result" style="display: none; white-space: pre;">
   <br/>
   No origins matching the search criteria were found.
 </p>
 
 <ul class="pagination justify-content-center swh-search-pagination">
   <li class="disabled page-item" id="origins-prev-results-button"><a class="page-link" href="#" tabindex="-1">Previous</a></li>
   <li class="disabled page-item" id="origins-next-results-button"><a class="page-link" href="#" tabindex="-1">Next</a></li>
 </ul>
 
 <script>
   swh.webapp.initPage('search');
 </script>
 {% endblock %}
diff --git a/swh/web/templates/browse/vault-ui.html b/swh/web/browse/templates/browse-vault-ui.html
similarity index 92%
rename from swh/web/templates/browse/vault-ui.html
rename to swh/web/browse/templates/browse-vault-ui.html
index 2e82539a..2c729755 100644
--- a/swh/web/templates/browse/vault-ui.html
+++ b/swh/web/browse/templates/browse-vault-ui.html
@@ -1,51 +1,51 @@
-{% extends "./layout.html" %}
+{% extends "./browse.html" %}
 
 {% comment %}
-Copyright (C) 2017-2019  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load render_bundle from webpack_loader %}
 
 {% block navbar-content %}
 <h4>Download archived software</h4>
 {% endblock %}
 
 {% block browse-content %}
 <p>
   This interface enables you to track the status of the different Software Heritage
   Vault cooking tasks created while browsing the archive.
 </p>
 <p>
   Once a cooking task is finished, a link will be made available in order to
   download the associated archive.
 </p>
 <button type="button" class="btn btn-default btn-sm" id="vault-remove-tasks">Remove selected tasks</button>
 <div class="table-responsive mt-3">
   <table class="table swh-table swh-table-striped swh-vault-table" id="vault-cooking-tasks">
     <thead>
       <tr>
         <th>
           <div class="custom-control custom-checkbox">
             <input type="checkbox" class="custom-control-input" id="vault-tasks-toggle-selection">
             <label class="custom-control-label" for="vault-tasks-toggle-selection"></label>
           </div>
         </th>
         <th style="width: 300px">Origin</th>
         <th style="width: 100px">Bundle type</th>
         <th>Object info</th>
         <th style="width: 250px">Cooking status</th>
         <th style="width: 120px"></th>
       </tr>
     </thead>
     <tbody></tbody>
   </table>
 </div>
-{% include "includes/vault-common.html" %}
+{% include "./includes/vault-common.html" %}
 <script>
   swh.webapp.initPage('vault');
   swh.vault.initUi();
 </script>
 {% endblock %}
diff --git a/swh/web/templates/browse/browse.html b/swh/web/browse/templates/browse.html
similarity index 67%
rename from swh/web/templates/browse/browse.html
rename to swh/web/browse/templates/browse.html
index 1e98e7cc..442aff74 100644
--- a/swh/web/templates/browse/browse.html
+++ b/swh/web/browse/templates/browse.html
@@ -1,38 +1,47 @@
-{% extends "./layout.html" %}
+{% extends "layout.html" %}
 
 {% comment %}
-Copyright (C) 2017-2020  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
+{% load render_bundle from webpack_loader %}
 
 {% block title %}{{ heading }} &ndash; Software Heritage archive{% endblock %}
 
+{% block header %}
+{% render_bundle 'browse' %}
+{% render_bundle 'vault' %}
+{% render_bundle 'save' %}
+{% endblock %}
+
 {% block navbar-content %}
 
 <h4>
   Browse the archive
 </h4>
 
 {% endblock %}
 
+{% block content %}
 {% block browse-content %}
 
 {% block swh-browse-before-content %}
 {% if snapshot_context %}
-  {% include "includes/snapshot-context.html" %}
+  {% include "./includes/snapshot-context.html" %}
 {% endif %}
 {% endblock %}
 
 {% block swh-browse-content %}{% endblock %}
 
 {% block swh-browse-after-content %}{% endblock %}
 
 <script>
   swh.webapp.initPage('browse');
 </script>
 
 {% endblock %}
+{% endblock %}
diff --git a/swh/web/templates/includes/branch-search.html b/swh/web/browse/templates/includes/branch-search.html
similarity index 100%
rename from swh/web/templates/includes/branch-search.html
rename to swh/web/browse/templates/includes/branch-search.html
diff --git a/swh/web/templates/includes/breadcrumbs.html b/swh/web/browse/templates/includes/breadcrumbs.html
similarity index 100%
rename from swh/web/templates/includes/breadcrumbs.html
rename to swh/web/browse/templates/includes/breadcrumbs.html
diff --git a/swh/web/templates/includes/content-display.html b/swh/web/browse/templates/includes/content-display.html
similarity index 97%
rename from swh/web/templates/includes/content-display.html
rename to swh/web/browse/templates/includes/content-display.html
index aa1ec399..c612189b 100644
--- a/swh/web/templates/includes/content-display.html
+++ b/swh/web/browse/templates/includes/content-display.html
@@ -1,85 +1,85 @@
 {% comment %}
 Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
-{% include "includes/revision-info.html" %}
+{% include "./revision-info.html" %}
 
 {% if snapshot_context and snapshot_context.is_empty %}
-  {% include "includes/empty-snapshot.html" %}
+  {% include "./empty-snapshot.html" %}
 {% else %}
   {% if not iframe_mode %}
     <div class="card">
       {% if filename %}
         <div class="swh-content-filename card-header bg-gray-light swh-heading-color">
           {{ filename }}
         </div>
       {% endif %}
   {% endif %}
     <div class="swh-content">
       {% if content_size > max_content_size %}
         Content is too large to be displayed (size is greater than {{ max_content_size|filesizeformat }}).
       {% elif "inode/x-empty" == mimetype %}
         <i>File is empty</i>
       {% elif mimetype in browsers_supported_image_mimes and content %}
         <img src="data:{{ mimetype }};base64,{{ content }}"/>
       {% elif "application/pdf" == mimetype %}
         <div class="text-center">
           <div class="py-2">
             <button class="btn btn-default btn-sm" id="pdf-prev">Previous</button>
             <span>Page: <span id="pdf-page-num"></span> / <span id="pdf-page-count"></span></span>
             <button class="btn btn-default btn-sm" id="pdf-next">Next</button>
           </div>
           <canvas id="pdf-canvas"></canvas>
         </div>
       {% elif filename and filename|default:""|slice:"-5:" == "ipynb" %}
         <div class="swh-ipynb">
         </div>
       {% elif "text/" in mimetype or "application/" in mimetype and encoding != "binary" %}
         <div class="highlightjs">
           <pre><code class="{{ language }}">{{ content }}</code></pre>
         </div>
       {% elif content %}
         Content with mime type {{ mimetype }} and encoding {{ encoding }} cannot be displayed.
       {% else %}
         {% include "includes/http-error.html" %}
       {% endif %}
     </div>
   {% if not iframe_mode %}
     </div>
   {% endif %}
 
   {% if content %}
     <script>
       {% if "application/pdf" == mimetype %}
         swh.webapp.renderPdf({{ top_right_link.url|jsonify }});
       {% elif filename and filename|default:""|slice:"-5:" == "ipynb" %}
         swh.webapp.renderNotebook({{ top_right_link.url|jsonify }}, '.swh-ipynb');
       {% elif content %}
         let codeContainer = $('code');
         let content = codeContainer.text();
 
         swh.webapp.highlightCode(true, 'code', !{{ iframe_mode|jsonify }});
 
         function updateLanguage(language) {
           codeContainer.text(content);
           codeContainer.removeClass();
           codeContainer.addClass(language);
 
           let urlParams = new URLSearchParams(window.location.search);
           urlParams.set('language', language);
 
           const newUrl = window.location.pathname + '?' + urlParams.toString() + window.location.hash;
           window.history.replaceState('', document.title, newUrl);
 
           swh.webapp.highlightCode(true, 'code', !{{ iframe_mode|jsonify }});
         }
 
       {% endif %}
     </script>
   {% endif %}
 {% endif %}
diff --git a/swh/web/templates/includes/directory-display.html b/swh/web/browse/templates/includes/directory-display.html
similarity index 93%
rename from swh/web/templates/includes/directory-display.html
rename to swh/web/browse/templates/includes/directory-display.html
index 285adde1..dbc2a379 100644
--- a/swh/web/templates/includes/directory-display.html
+++ b/swh/web/browse/templates/includes/directory-display.html
@@ -1,69 +1,69 @@
 {% comment %}
-Copyright (C) 2017-2021  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% if not iframe_mode %}
-  {% include "includes/revision-info.html" %}
+  {% include "./revision-info.html" %}
 {% endif %}
 
 {% if snapshot_context and snapshot_context.is_empty %}
-  {% include "includes/empty-snapshot.html" %}
+  {% include "./empty-snapshot.html" %}
 {% elif dirs|length > 0 or files|length > 0 %}
   <div class="table-responsive">
     <table class="table swh-table swh-directory-table">
       <thead>
         <tr>
           <th>File</th>
           <th class="d-none d-md-table-cell">Mode</th>
           <th class="d-none d-sm-table-cell">Size</th>
         </tr>
       </thead>
       <tbody>
         {% for d in dirs %}
           <tr class="swh-directory-entry swh-tr-hover-highlight">
             <td class="swh-directory">
               <i class="{{ swh_object_icons.directory }} mdi-fw" aria-hidden="true"></i>
               <a href="{{ d.url | safe }}">
                 {{ d.name }}
               </a>
             </td>
             <td class="d-none d-md-table-cell">
             </td>
             <td class="d-none d-sm-table-cell">
             </td>
           </tr>
         {% endfor %}
         {% for f in files %}
           <tr class="swh-directory-entry swh-tr-hover-highlight">
             <td class="swh-content">
               <i class="{{ swh_object_icons.content }} mdi-fw" aria-hidden="true"></i>
               <a href="{{ f.url | safe }}">
                 {{ f.name }}
               </a>
             </td>
             <td class="d-none d-md-table-cell">
               {{ f.perms }}
             </td>
             <td class="d-none d-sm-table-cell">
               {% if f.length is not None %}{{ f.length|filesizeformat }}{% endif %}
             </td>
           </tr>
         {% endfor %}
       </tbody>
     </table>
   </div>
   {% if not iframe_mode %}
     <hr class="mt-0 mb-2">
   {% endif %}
 {% elif "revision_found" in swh_object_metadata and swh_object_metadata.revision_found is False %}
   <i>Revision {{ swh_object_metadata.revision }} could not be found in the archive.</i>
   <br/>
   <i>Its associated directory can not be displayed.</i>
 {% elif error_code != 200 %}
   {% include "includes/http-error.html" %}
 {% elif dirs|length == 0 and files|length == 0 %}
   <i>Directory is empty</i>
 {% endif %}
diff --git a/swh/web/templates/includes/empty-snapshot.html b/swh/web/browse/templates/includes/empty-snapshot.html
similarity index 100%
rename from swh/web/templates/includes/empty-snapshot.html
rename to swh/web/browse/templates/includes/empty-snapshot.html
diff --git a/swh/web/templates/includes/origin-search-form.html b/swh/web/browse/templates/includes/origin-search-form.html
similarity index 100%
rename from swh/web/templates/includes/origin-search-form.html
rename to swh/web/browse/templates/includes/origin-search-form.html
diff --git a/swh/web/templates/includes/readme-display.html b/swh/web/browse/templates/includes/readme-display.html
similarity index 100%
rename from swh/web/templates/includes/readme-display.html
rename to swh/web/browse/templates/includes/readme-display.html
diff --git a/swh/web/templates/includes/revision-info.html b/swh/web/browse/templates/includes/revision-info.html
similarity index 100%
rename from swh/web/templates/includes/revision-info.html
rename to swh/web/browse/templates/includes/revision-info.html
diff --git a/swh/web/templates/includes/show-metadata.html b/swh/web/browse/templates/includes/show-metadata.html
similarity index 100%
rename from swh/web/templates/includes/show-metadata.html
rename to swh/web/browse/templates/includes/show-metadata.html
diff --git a/swh/web/templates/includes/show-swhids.html b/swh/web/browse/templates/includes/show-swhids.html
similarity index 100%
rename from swh/web/templates/includes/show-swhids.html
rename to swh/web/browse/templates/includes/show-swhids.html
diff --git a/swh/web/templates/includes/snapshot-context.html b/swh/web/browse/templates/includes/snapshot-context.html
similarity index 100%
rename from swh/web/templates/includes/snapshot-context.html
rename to swh/web/browse/templates/includes/snapshot-context.html
diff --git a/swh/web/templates/includes/take-new-snapshot.html b/swh/web/browse/templates/includes/take-new-snapshot.html
similarity index 100%
rename from swh/web/templates/includes/take-new-snapshot.html
rename to swh/web/browse/templates/includes/take-new-snapshot.html
diff --git a/swh/web/templates/includes/top-navigation.html b/swh/web/browse/templates/includes/top-navigation.html
similarity index 95%
rename from swh/web/templates/includes/top-navigation.html
rename to swh/web/browse/templates/includes/top-navigation.html
index 987216e9..b28fd4ee 100644
--- a/swh/web/templates/includes/top-navigation.html
+++ b/swh/web/browse/templates/includes/top-navigation.html
@@ -1,155 +1,155 @@
 {% comment %}
-Copyright (C) 2017-2020  The Software Heritage developers
+Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 <div class="swh-browse-top-navigation d-flex align-items-start justify-content-between flex-wrap mt-1">
   {% if snapshot_context %}
     {% if snapshot_context.branch or snapshot_context.release or snapshot_context.revision_id %}
       <div class="dropdown" id="swh-branches-releases-dd">
         <button class="btn btn-block btn-default btn-sm dropdown-toggle" type="button" data-toggle="dropdown">
           {% if snapshot_context.branch %}
             {% if snapshot_context.branch_alias %}
               <i class="{{ swh_object_icons.alias }} mdi-fw" aria-hidden="true"></i>
             {% else %}
               <i class="{{ swh_object_icons.branch }} mdi-fw" aria-hidden="true"></i>
             {% endif %}
             Branch: <strong>{{ snapshot_context.branch }}</strong>
           {% elif snapshot_context.release %}
             {% if snapshot_context.release_alias %}
               <i class="{{ swh_object_icons.alias }} mdi-fw" aria-hidden="true"></i>
             {% else %}
               <i class="{{ swh_object_icons.release }} mdi-fw" aria-hidden="true"></i>
             {% endif %}
             Release: <strong>{{ snapshot_context.release }}</strong>
           {% elif snapshot_context.revision_id %}
             Revision: <strong>{{ snapshot_context.revision_id }}</strong>
           {% endif %}
           <span class="caret"></span>
         </button>
         <ul class="scrollable-menu dropdown-menu swh-branches-releases">
           <ul class="nav nav-tabs">
             <li class="nav-item"><a class="nav-link active swh-branches-switch" data-toggle="tab">Branches</a></li>
             <li class="nav-item"><a class="nav-link swh-releases-switch" data-toggle="tab">Releases</a></li>
           </ul>
           <div class="tab-content">
             <div class="tab-pane active" id="swh-tab-branches">
               {% for b in snapshot_context.branches %}
                 <li class="swh-branch">
                   <a href="{{ b.url | safe }}">
                     {% if b.alias %}
                       <i class="{{ swh_object_icons.alias }} mdi-fw" aria-hidden="true"></i>
                     {% else %}
                       <i class="{{ swh_object_icons.branch }} mdi-fw" aria-hidden="true"></i>
                     {% endif %}
                     {% if b.name == snapshot_context.branch %}
                       <i class="mdi mdi-check-bold mdi-fw" aria-hidden="true"></i>
                     {% else %}
                       <i class="mdi mdi-fw" aria-hidden="true"></i>
                     {% endif %}
                     {{ b.name }}
                   </a>
                 </li>
               {% endfor %}
               {% if snapshot_context.branches|length < snapshot_context.snapshot_sizes.revision %}
                 <li>
                   <i class="mdi mdi-alert mdi-fw" aria-hidden="true"></i>
                   Branches list truncated to {{ snapshot_context.branches|length }} entries,
                   {{ snapshot_context.branches|length|mul:-1|add:snapshot_context.snapshot_sizes.revision }}
                   were omitted.
                 </li>
               {% endif %}
             </div>
             <div class="tab-pane" id="swh-tab-releases">
               {% if snapshot_context.releases %}
                 {% for r in snapshot_context.releases %}
                   {% if r.target_type == 'revision' or r.target_type == 'directory' %}
                     <li class="swh-release">
                       <a href="{{ r.url | safe }}">
                         {% if r.alias %}
                           <i class="{{ swh_object_icons.alias }} mdi-fw" aria-hidden="true"></i>
                         {% else %}
                           <i class="{{ swh_object_icons.release }} mdi-fw" aria-hidden="true"></i>
                         {% endif %}
                         {% if r.name == snapshot_context.release %}
                           <i class="mdi mdi-check-bold mdi-fw" aria-hidden="true"></i>
                         {% else %}
                           <i class="mdi mdi-fw" aria-hidden="true"></i>
                         {% endif %}
                         {{ r.name }}
                       </a>
                     </li>
                   {% endif %}
                 {% endfor %}
                 {% if snapshot_context.releases|length < snapshot_context.snapshot_sizes.release %}
                 <li>
                   <i class="mdi mdi-alert mdi-fw" aria-hidden="true"></i>
                   Releases list truncated to {{ snapshot_context.releases|length }} entries,
                   {{ snapshot_context.releases|length|mul:-1|add:snapshot_context.snapshot_sizes.release }}
                   were omitted.
                 </li>
               {% endif %}
               {% else %}
                 <span>No releases to show</span>
               {% endif %}
             </div>
           </div>
         </ul>
       </div>
     {% endif %}
   {% endif %}
 
   <div id="swh-breadcrumbs-container" class="flex-grow-1">
-    {% include "includes/breadcrumbs.html" %}
+    {% include "./breadcrumbs.html" %}
   </div>
 
   <div class="btn-group swh-actions-dropdown ml-auto">
     {% if top_right_link %}
       <a href="{{ top_right_link.url | safe }}" class="btn btn-default btn-sm swh-tr-link" role="button">
         {% if top_right_link.icon %}
           <i class="{{ top_right_link.icon }} mdi-fw" aria-hidden="true"></i>
         {% endif %}
         {{ top_right_link.text }}
       </a>
     {% endif %}
     {% if available_languages %}
       <select data-placeholder="Select Language" class="language-select chosen-select">
         <option value=""></option>
         {% for lang in available_languages %}
           <option value="{{ lang }}">{{ lang }}</option>
         {% endfor %}
       </select>
     {% endif %}
     {% if show_actions %}
       {% if not snapshot_context or not snapshot_context.is_empty %}
-        {% include "includes/vault-create-tasks.html" %}
+        {% include "./vault-create-tasks.html" %}
       {% endif %}
       {% if "swh.web.save_code_now" in SWH_DJANGO_APPS %}
-        {% include "includes/take-new-snapshot.html" %}
+        {% include "./take-new-snapshot.html" %}
       {% endif %}
-      {% include "includes/show-metadata.html" %}
+      {% include "./show-metadata.html" %}
     {% endif %}
   </div>
 </div>
 
-{% include "includes/show-swhids.html" %}
+{% include "./show-swhids.html" %}
 
 <script>
   var snapshotContext = false;
   var branch = false;
   {% if snapshot_context %}
     snapshotContext = true;
     branch = "{{ snapshot_context.branch|escape }}";
   {% endif %}
   {% if available_languages %}
     $(".chosen-select").val("{{ language }}");
     $(".chosen-select").chosen().change(function(event, params) {
       updateLanguage(params.selected);
     });
   {% endif %}
   swh.browse.initSnapshotNavigation(snapshotContext, branch !== "None");
 </script>
diff --git a/swh/web/templates/includes/vault-common.html b/swh/web/browse/templates/includes/vault-common.html
similarity index 100%
rename from swh/web/templates/includes/vault-common.html
rename to swh/web/browse/templates/includes/vault-common.html
diff --git a/swh/web/templates/includes/vault-create-tasks.html b/swh/web/browse/templates/includes/vault-create-tasks.html
similarity index 99%
rename from swh/web/templates/includes/vault-create-tasks.html
rename to swh/web/browse/templates/includes/vault-create-tasks.html
index 811f5a3a..4ecaea6c 100644
--- a/swh/web/templates/includes/vault-create-tasks.html
+++ b/swh/web/browse/templates/includes/vault-create-tasks.html
@@ -1,177 +1,177 @@
 {% comment %}
 Copyright (C) 2017-2022  The Software Heritage developers
 See the AUTHORS file at the top-level directory of this distribution
 License: GNU Affero General Public License version 3, or any later version
 See top-level LICENSE file for more information
 {% endcomment %}
 
 {% load swh_templatetags %}
 
 {% if vault_cooking.directory_context or vault_cooking.revision_context %}
   {% if user.is_authenticated  and user.is_staff or "swh.vault.git_bare.ui" in user.get_all_permissions %}
     <div class="btn-group">
       <button class="btn btn-default btn-sm dropdown-toggle swh-vault-download" type="button" data-toggle="dropdown">
         <i class="mdi mdi-download mdi-fw" aria-hidden="true"></i>
         Download
       </button>
       <div class="dropdown-menu swh-vault-menu">
         {% if vault_cooking.directory_context %}
           <button class="dropdown-item" type="button" tabindex="-1" onclick="swh.vault.vaultRequest('directory', '{{ vault_cooking.directory_swhid }}')">
             <i class="{{ swh_object_icons.directory }} mdi-fw" aria-hidden="true"></i>
             as tarball
           </button>
         {% endif %}
         {% if vault_cooking.revision_context %}
           <button class="dropdown-item" type="button" tabindex="-1" onclick="swh.vault.vaultRequest('revision', '{{ vault_cooking.revision_swhid }}')">
             <i class="{{ swh_object_icons.revision }} mdi-fw" aria-hidden="true"></i>
             as git
           </button>
         {% endif %}
       </div>
     </div>
   {% else %}
     <button class="btn btn-default btn-sm swh-vault-download" type="button" onclick="swh.vault.vaultRequest('directory', '{{ vault_cooking.directory_swhid }}')">
       <i class="mdi mdi-download mdi-fw" aria-hidden="true"></i>
       Download
     </button>
   {% endif %}
 
 
   <!-- modals related to the creation of vault cooking tasks -->
   <!-- they will be reparented in the script below in order to be able to display them -->
   <div class="modal fade" id="vault-cook-directory-modal" tabindex="-1" role="dialog" aria-labelledby="vault-cook-directory-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h6 class="modal-title" id="vault-cook-directory-modal-label">Cook and download a directory from the Software Heritage Vault</h6>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>
         <div class="modal-body">
           <p>
             You have requested the cooking of the directory with identifier <strong>{{ vault_cooking.directory_swhid }}</strong>
             into a standard <code>tar.gz archive</code>.
           </p>
           <p>
             Are you sure you want to continue ?
           </p>
           <form>
             <div class="form-group">
               <label for="email">(Optional) Send download link once it is available to that email address:</label>
               <input type="email" class="form-control" id="swh-vault-directory-email">
             </div>
           </form>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-default btn-sm" onclick="swh.vault.cookDirectoryArchive('{{ vault_cooking.directory_swhid }}')">Ok</button>
         </div>
       </div>
     </div>
   </div>
 
   <div class="modal fade" id="vault-fetch-directory-modal" tabindex="-1" role="dialog" aria-labelledby="vault-fetch-directory-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h6 class="modal-title" id="vault-fetch-directory-modal-label">Download a directory from the Software Heritage Vault</h6>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>
         <div class="modal-body">
           <p>
             You have requested the download of the directory with identifier <strong>{{ vault_cooking.directory_swhid }}</strong>
             as a standard <code>tar.gz archive</code>.
           </p>
           <p>
             Are you sure you want to continue ?
           </p>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-default btn-sm" onclick="swh.vault.fetchDirectoryArchive('{{ vault_cooking.directory_swhid }}')">Ok</button>
         </div>
       </div>
     </div>
   </div>
 
   <div class="modal fade" id="vault-cook-revision-modal" tabindex="-1" role="dialog" aria-labelledby="vault-cook-revision-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h6 class="modal-title" id="vault-cook-revision-modal-label">Cook and download a revision from the Software Heritage Vault</h6>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>
         <div class="modal-body">
           <p>
             You have requested the cooking of the history heading to revision with identifier <strong>{{ vault_cooking.revision_swhid }}</strong>
             into a <code>bare git archive</code>.
           </p>
           <p>
             Are you sure you want to continue ?
           </p>
           <form>
             <div class="form-group">
               <label for="email">(Optional) Send download link once it is available to that email address:</label>
               <input type="email" class="form-control" id="swh-vault-revision-email">
             </div>
           </form>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-default btn-sm" onclick="swh.vault.cookRevisionArchive('{{ vault_cooking.revision_swhid }}')">Ok</button>
         </div>
       </div>
     </div>
   </div>
 
   <div class="modal fade" id="vault-fetch-revision-modal" tabindex="-1" role="dialog" aria-labelledby="vault-fetch-revision-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h6 class="modal-title" id="vault-fetch-revision-modal-label">Download a revision from the Software Heritage Vault</h6>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
           </button>
         </div>
         <div class="modal-body">
           <p>
             You have requested the download of the history heading to revision with identifier <strong>{{ vault_cooking.revision_swhid }}</strong>
             as a <code>bare git archive</code>.
           </p>
           <p>
             Are you sure you want to continue ?
           </p>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">Cancel</button>
           <button type="button" class="btn btn-default btn-sm" onclick="swh.vault.fetchRevisionArchive('{{ vault_cooking.revision_swhid }}')">Ok</button>
         </div>
       </div>
     </div>
   </div>
 
   <div class="modal fade" id="invalid-email-modal" tabindex="-1" role="dialog" aria-labelledby="invalid-email-modal-label" aria-hidden="true">
     <div class="modal-dialog">
       <div class="modal-content">
         <div class="modal-header">
           <h4 class="modal-title" id="invalid-email-modal-label">Invalid Email !</h4>
           <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
         </div>
         <div class="modal-body">
           <p>The provided email is not well-formed.</p>
         </div>
         <div class="modal-footer">
           <button type="button" class="btn btn-default btn-sm" data-dismiss="modal">Ok</button>
         </div>
       </div>
     </div>
   </div>
 
-  {% include "includes/vault-common.html" %}
+  {% include "./vault-common.html" %}
 
 {% endif %}
diff --git a/swh/web/browse/urls.py b/swh/web/browse/urls.py
index 2e9762f0..0bf42504 100644
--- a/swh/web/browse/urls.py
+++ b/swh/web/browse/urls.py
@@ -1,64 +1,64 @@
 # Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect, render
 from django.urls import re_path as url
 
 from swh.web.browse.browseurls import BrowseUrls
 from swh.web.browse.identifiers import swhid_browse
 import swh.web.browse.views.content  # noqa
 import swh.web.browse.views.directory  # noqa
 import swh.web.browse.views.origin  # noqa
 import swh.web.browse.views.release  # noqa
 import swh.web.browse.views.revision  # noqa
 import swh.web.browse.views.snapshot  # noqa
 from swh.web.utils import origin_visit_types, reverse
 
 
 def _browse_help_view(request: HttpRequest) -> HttpResponse:
     return render(
-        request, "browse/help.html", {"heading": "How to browse the archive ?"}
+        request, "browse-help.html", {"heading": "How to browse the archive ?"}
     )
 
 
 def _browse_search_view(request: HttpRequest) -> HttpResponse:
     return render(
         request,
-        "browse/search.html",
+        "browse-search.html",
         {
             "heading": "Search software origins to browse",
             "visit_types": origin_visit_types(),
         },
     )
 
 
 def _browse_vault_view(request: HttpRequest) -> HttpResponse:
     return render(
         request,
-        "browse/vault-ui.html",
+        "browse-vault-ui.html",
         {"heading": "Download archive content from the Vault"},
     )
 
 
 def _browse_origin_save_view(request: HttpRequest) -> HttpResponse:
     return redirect(reverse("origin-save"))
 
 
 urlpatterns = [
     url(r"^browse/$", _browse_search_view),
     url(r"^browse/help/$", _browse_help_view, name="browse-help"),
     url(r"^browse/search/$", _browse_search_view, name="browse-search"),
     url(r"^browse/vault/$", _browse_vault_view, name="browse-vault"),
     # for backward compatibility
     url(r"^browse/origin/save/$", _browse_origin_save_view, name="browse-origin-save"),
     url(
         r"^browse/(?P<swhid>swh:[0-9]+:[a-z]+:[0-9a-f]+.*)/$",
         swhid_browse,
         name="browse-swhid-legacy",
     ),
 ]
 
 urlpatterns += BrowseUrls.get_url_patterns()
diff --git a/swh/web/browse/views/content.py b/swh/web/browse/views/content.py
index 9eb8dd70..e16af1d2 100644
--- a/swh/web/browse/views/content.py
+++ b/swh/web/browse/views/content.py
@@ -1,467 +1,467 @@
 # Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import difflib
 from distutils.util import strtobool
 from typing import Any, Dict, Optional
 
 from django.http import HttpRequest, HttpResponse, JsonResponse
 from django.shortcuts import redirect, render
 
 from swh.model.hashutil import hash_to_hex
 from swh.model.swhids import ObjectType
 from swh.web.browse.browseurls import browse_route
 from swh.web.browse.snapshot_context import get_snapshot_context
 from swh.web.browse.utils import (
     content_display_max_size,
     gen_link,
     prepare_content_for_display,
     request_content,
 )
 from swh.web.utils import (
     archive,
     gen_path_info,
     highlightjs,
     query,
     reverse,
     swh_object_icons,
 )
 from swh.web.utils.exc import (
     BadInputExc,
     NotFoundExc,
     http_status_code_message,
     sentry_capture_exception,
 )
 from swh.web.utils.identifiers import get_swhids_info
 from swh.web.utils.typing import ContentMetadata, SWHObjectInfo
 
 
 @browse_route(
     r"content/(?P<query_string>[0-9a-z_:]*[0-9a-f]+)/raw/",
     view_name="browse-content-raw",
     checksum_args=["query_string"],
 )
 def content_raw(request: HttpRequest, query_string: str) -> HttpResponse:
     """Django view that produces a raw display of a content identified
     by its hash value.
 
     The url that points to it is
     :http:get:`/browse/content/[(algo_hash):](hash)/raw/`
     """
     re_encode = bool(strtobool(request.GET.get("re_encode", "false")))
     algo, checksum = query.parse_hash(query_string)
     checksum = hash_to_hex(checksum)
     content_data = request_content(query_string, max_size=None, re_encode=re_encode)
 
     filename = request.GET.get("filename", None)
     if not filename:
         filename = "%s_%s" % (algo, checksum)
 
     if (
         content_data["mimetype"].startswith("text/")
         or content_data["mimetype"] == "inode/x-empty"
     ):
         response = HttpResponse(content_data["raw_data"], content_type="text/plain")
         response["Content-disposition"] = "filename=%s" % filename
     else:
         response = HttpResponse(
             content_data["raw_data"], content_type="application/octet-stream"
         )
         response["Content-disposition"] = "attachment; filename=%s" % filename
     return response
 
 
 _auto_diff_size_limit = 20000
 
 
 @browse_route(
     r"content/(?P<from_query_string>.*)/diff/(?P<to_query_string>.*)/",
     view_name="diff-contents",
 )
 def _contents_diff(
     request: HttpRequest, from_query_string: str, to_query_string: str
 ) -> HttpResponse:
     """
     Browse endpoint used to compute unified diffs between two contents.
 
     Diffs are generated only if the two contents are textual.
     By default, diffs whose size are greater than 20 kB will
     not be generated. To force the generation of large diffs,
     the 'force' boolean query parameter must be used.
 
     Args:
         request: input django http request
         from_query_string: a string of the form "[ALGO_HASH:]HASH" where
             optional ALGO_HASH can be either ``sha1``, ``sha1_git``,
             ``sha256``, or ``blake2s256`` (default to ``sha1``) and HASH
             the hexadecimal representation of the hash value identifying
             the first content
         to_query_string: same as above for identifying the second content
 
     Returns:
         A JSON object containing the unified diff.
 
     """
     diff_data = {}
     content_from = None
     content_to = None
     content_from_size = 0
     content_to_size = 0
     content_from_lines = []
     content_to_lines = []
     force_str = request.GET.get("force", "false")
     path = request.GET.get("path", None)
     language = "plaintext"
 
     force = bool(strtobool(force_str))
 
     if from_query_string == to_query_string:
         diff_str = "File renamed without changes"
     else:
         try:
             text_diff = True
             if from_query_string:
                 content_from = request_content(from_query_string, max_size=None)
                 content_from_display_data = prepare_content_for_display(
                     content_from["raw_data"], content_from["mimetype"], path
                 )
                 language = content_from_display_data["language"]
                 content_from_size = content_from["length"]
                 if not (
                     content_from["mimetype"].startswith("text/")
                     or content_from["mimetype"] == "inode/x-empty"
                 ):
                     text_diff = False
 
             if text_diff and to_query_string:
                 content_to = request_content(to_query_string, max_size=None)
                 content_to_display_data = prepare_content_for_display(
                     content_to["raw_data"], content_to["mimetype"], path
                 )
                 language = content_to_display_data["language"]
                 content_to_size = content_to["length"]
                 if not (
                     content_to["mimetype"].startswith("text/")
                     or content_to["mimetype"] == "inode/x-empty"
                 ):
                     text_diff = False
 
             diff_size = abs(content_to_size - content_from_size)
 
             if not text_diff:
                 diff_str = "Diffs are not generated for non textual content"
                 language = "plaintext"
             elif not force and diff_size > _auto_diff_size_limit:
                 diff_str = "Large diffs are not automatically computed"
                 language = "plaintext"
             else:
                 if content_from:
                     content_from_lines = (
                         content_from["raw_data"].decode("utf-8").splitlines(True)
                     )
                     if content_from_lines and content_from_lines[-1][-1] != "\n":
                         content_from_lines[-1] += "[swh-no-nl-marker]\n"
 
                 if content_to:
                     content_to_lines = (
                         content_to["raw_data"].decode("utf-8").splitlines(True)
                     )
                     if content_to_lines and content_to_lines[-1][-1] != "\n":
                         content_to_lines[-1] += "[swh-no-nl-marker]\n"
 
                 diff_lines = difflib.unified_diff(content_from_lines, content_to_lines)
                 diff_str = "".join(list(diff_lines)[2:])
         except Exception as exc:
             sentry_capture_exception(exc)
             diff_str = str(exc)
 
     diff_data["diff_str"] = diff_str
     diff_data["language"] = language
     return JsonResponse(diff_data)
 
 
 def _get_content_from_request(request: HttpRequest) -> Dict[str, Any]:
     path = request.GET.get("path")
     if path is None:
         raise BadInputExc("The path query parameter must be provided.")
     snapshot = request.GET.get("snapshot") or request.GET.get("snapshot_id")
     origin_url = request.GET.get("origin_url")
     if snapshot is None and origin_url is None:
         raise BadInputExc(
             "The origin_url or snapshot query parameters must be provided."
         )
 
     visit_id = int(request.GET.get("visit_id", 0))
     snapshot_context = get_snapshot_context(
         snapshot_id=snapshot,
         origin_url=origin_url,
         path=path,
         timestamp=request.GET.get("timestamp"),
         visit_id=visit_id or None,
         branch_name=request.GET.get("branch"),
         release_name=request.GET.get("release"),
         browse_context="content",
     )
     root_directory = snapshot_context["root_directory"]
     assert root_directory is not None  # to keep mypy happy
     return archive.lookup_directory_with_path(root_directory, path)
 
 
 @browse_route(
     r"content/(?P<query_string>[0-9a-z_:]*[0-9a-f]+)/",
     r"content/",
     view_name="browse-content",
     checksum_args=["query_string"],
 )
 def content_display(
     request: HttpRequest, query_string: Optional[str] = None
 ) -> HttpResponse:
     """Django view that produces an HTML display of a content identified
     by its hash value.
 
     The URLs that points to it are
     :http:get:`/browse/content/[(algo_hash):](hash)/`
     :http:get:`/browse/content/`
     """
     if query_string is None:
         # this case happens when redirected from origin/content or snapshot/content
         content_data = _get_content_from_request(request)
         return redirect(
             reverse(
                 "browse-content",
                 url_args={"query_string": f"sha1_git:{content_data['target']}"},
                 query_params=request.GET,
             ),
         )
 
     algo, checksum = query.parse_hash(query_string)
     checksum = hash_to_hex(checksum)
     origin_url = request.GET.get("origin_url")
     selected_language = request.GET.get("language")
     if not origin_url:
         origin_url = request.GET.get("origin")
     snapshot_id = request.GET.get("snapshot") or request.GET.get("snapshot_id")
     path = request.GET.get("path")
     content_data = {}
     error_info: Dict[str, Any] = {"status_code": 200, "description": None}
     try:
         content_data = request_content(query_string)
     except NotFoundExc as e:
         error_info["status_code"] = 404
         error_info["description"] = f"NotFoundExc: {str(e)}"
 
     snapshot_context = None
     if origin_url is not None or snapshot_id is not None:
         try:
             visit_id = int(request.GET.get("visit_id", 0))
             snapshot_context = get_snapshot_context(
                 origin_url=origin_url,
                 snapshot_id=snapshot_id,
                 timestamp=request.GET.get("timestamp"),
                 visit_id=visit_id or None,
                 branch_name=request.GET.get("branch"),
                 release_name=request.GET.get("release"),
                 revision_id=request.GET.get("revision"),
                 path=path,
                 browse_context="content",
             )
         except NotFoundExc as e:
             if str(e).startswith("Origin") and origin_url is not None:
                 raw_cnt_url = reverse(
                     "browse-content", url_args={"query_string": query_string}
                 )
                 error_message = (
                     "The Software Heritage archive has a content "
                     "with the hash you provided but the origin "
                     "mentioned in your request appears broken: %s. "
                     "Please check the URL and try again.\n\n"
                     "Nevertheless, you can still browse the content "
                     "without origin information: %s"
                     % (gen_link(origin_url), gen_link(raw_cnt_url))
                 )
                 raise NotFoundExc(error_message)
             else:
                 raise e
     content = None
     language = None
     mimetype = None
     if content_data.get("raw_data") is not None:
         content_display_data = prepare_content_for_display(
             content_data["raw_data"], content_data["mimetype"], path
         )
         content = content_display_data["content_data"]
         language = content_display_data["language"]
         mimetype = content_display_data["mimetype"]
 
     # Override language with user-selected language
     if selected_language is not None:
         language = selected_language
 
     available_languages = None
 
     if mimetype and "text/" in mimetype:
         available_languages = highlightjs.get_supported_languages()
 
     filename = None
     path_info = None
     directory_id = None
 
     root_dir = None
     if snapshot_context:
         root_dir = snapshot_context.get("root_directory")
 
     query_params = snapshot_context["query_params"] if snapshot_context else {}
 
     breadcrumbs = []
 
     if path:
         split_path = path.split("/")
         root_dir = root_dir or split_path[0]
         filename = split_path[-1]
         if root_dir != path:
             path = path.replace(root_dir + "/", "")
             path = path[: -len(filename)]
             path_info = gen_path_info(path)
             query_params.pop("path", None)
             dir_url = reverse(
                 "browse-directory",
                 url_args={"sha1_git": root_dir},
                 query_params=query_params,
             )
             breadcrumbs.append({"name": root_dir[:7], "url": dir_url})
             for pi in path_info:
                 query_params["path"] = pi["path"]
                 dir_url = reverse(
                     "browse-directory",
                     url_args={"sha1_git": root_dir},
                     query_params=query_params,
                 )
                 breadcrumbs.append({"name": pi["name"], "url": dir_url})
         breadcrumbs.append({"name": filename, "url": ""})
 
     if path and root_dir is not None and root_dir != path:
         dir_info = archive.lookup_directory_with_path(root_dir, path)
         directory_id = dir_info["target"]
     elif root_dir != path:
         directory_id = root_dir
     else:
         root_dir = None
 
     query_params = {"filename": filename}
 
     content_checksums = content_data.get("checksums", {})
 
     content_url = reverse(
         "browse-content",
         url_args={"query_string": query_string},
     )
 
     content_raw_url = reverse(
         "browse-content-raw",
         url_args={"query_string": query_string},
         query_params=query_params,
     )
 
     content_metadata = ContentMetadata(
         object_type=ObjectType.CONTENT,
         object_id=content_checksums.get("sha1_git"),
         sha1=content_checksums.get("sha1"),
         sha1_git=content_checksums.get("sha1_git"),
         sha256=content_checksums.get("sha256"),
         blake2s256=content_checksums.get("blake2s256"),
         content_url=content_url,
         mimetype=content_data.get("mimetype", ""),
         encoding=content_data.get("encoding", ""),
         size=content_data.get("length", 0),
         language=content_data.get("language", ""),
         root_directory=root_dir,
         path=f"/{path}" if path else None,
         filename=filename or "",
         directory=directory_id,
         revision=None,
         release=None,
         snapshot=None,
         origin_url=origin_url,
     )
 
     swh_objects = []
     if content_checksums:
         swh_objects.append(
             SWHObjectInfo(
                 object_type=ObjectType.CONTENT,
                 object_id=content_checksums.get("sha1_git"),
             )
         )
 
     if directory_id:
         swh_objects.append(
             SWHObjectInfo(object_type=ObjectType.DIRECTORY, object_id=directory_id)
         )
 
     if snapshot_context:
         if snapshot_context["revision_id"]:
             swh_objects.append(
                 SWHObjectInfo(
                     object_type=ObjectType.REVISION,
                     object_id=snapshot_context["revision_id"],
                 )
             )
         swh_objects.append(
             SWHObjectInfo(
                 object_type=ObjectType.SNAPSHOT,
                 object_id=snapshot_context["snapshot_id"],
             )
         )
         if snapshot_context["release_id"]:
             swh_objects.append(
                 SWHObjectInfo(
                     object_type=ObjectType.RELEASE,
                     object_id=snapshot_context["release_id"],
                 )
             )
 
     swhids_info = get_swhids_info(
         swh_objects,
         snapshot_context,
         extra_context=content_metadata,
     )
 
     heading = "Content - %s" % content_checksums.get("sha1_git")
     if breadcrumbs:
         content_path = "/".join(bc["name"] for bc in breadcrumbs)
         heading += " - %s" % content_path
 
     return render(
         request,
-        "browse/content.html",
+        "browse-content.html",
         {
             "heading": heading,
             "swh_object_id": swhids_info[0]["swhid"] if swhids_info else "",
             "swh_object_name": "Content",
             "swh_object_metadata": content_metadata,
             "content": content,
             "content_size": content_data.get("length"),
             "max_content_size": content_display_max_size,
             "filename": filename,
             "encoding": content_data.get("encoding"),
             "mimetype": mimetype,
             "language": language,
             "available_languages": available_languages,
             "breadcrumbs": breadcrumbs,
             "top_right_link": {
                 "url": content_raw_url,
                 "icon": swh_object_icons["content"],
                 "text": "Raw File",
             },
             "snapshot_context": snapshot_context,
             "vault_cooking": None,
             "show_actions": True,
             "swhids_info": swhids_info,
             "error_code": error_info["status_code"],
             "error_message": http_status_code_message.get(error_info["status_code"]),
             "error_description": error_info["description"],
         },
         status=error_info["status_code"],
     )
diff --git a/swh/web/browse/views/directory.py b/swh/web/browse/views/directory.py
index 7cc22729..199a5e81 100644
--- a/swh/web/browse/views/directory.py
+++ b/swh/web/browse/views/directory.py
@@ -1,303 +1,303 @@
 # Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import os
 from typing import Any, Dict, Optional
 
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect, render
 
 from swh.model.swhids import ObjectType
 from swh.web.browse.browseurls import browse_route
 from swh.web.browse.snapshot_context import get_snapshot_context
 from swh.web.browse.utils import gen_link, get_directory_entries, get_readme_to_display
 from swh.web.utils import archive, gen_path_info, reverse, swh_object_icons
 from swh.web.utils.exc import (
     NotFoundExc,
     http_status_code_message,
     sentry_capture_exception,
 )
 from swh.web.utils.identifiers import get_swhids_info
 from swh.web.utils.typing import DirectoryMetadata, SWHObjectInfo
 
 
 def _directory_browse(
     request: HttpRequest, sha1_git: str, path: Optional[str] = None
 ) -> HttpResponse:
     root_sha1_git = sha1_git
     dir_sha1_git: Optional[str] = sha1_git
     error_info: Dict[str, Any] = {"status_code": 200, "description": None}
     if path:
         try:
             dir_info = archive.lookup_directory_with_path(sha1_git, path)
             dir_sha1_git = dir_info["target"]
         except NotFoundExc as e:
             error_info["status_code"] = 404
             error_info["description"] = f"NotFoundExc: {str(e)}"
             dir_sha1_git = None
 
     dirs, files = [], []
     if dir_sha1_git is not None:
         dirs, files = get_directory_entries(dir_sha1_git)
     origin_url = request.GET.get("origin_url")
     if not origin_url:
         origin_url = request.GET.get("origin")
     snapshot_id = request.GET.get("snapshot")
     snapshot_context = None
     if origin_url is not None or snapshot_id is not None:
         try:
             snapshot_context = get_snapshot_context(
                 snapshot_id=snapshot_id,
                 origin_url=origin_url,
                 branch_name=request.GET.get("branch"),
                 release_name=request.GET.get("release"),
                 revision_id=request.GET.get("revision"),
                 path=path,
             )
         except NotFoundExc as e:
             if str(e).startswith("Origin") and origin_url is not None:
                 raw_dir_url = reverse(
                     "browse-directory", url_args={"sha1_git": dir_sha1_git}
                 )
                 error_message = (
                     "The Software Heritage archive has a directory "
                     "with the hash you provided but the origin "
                     "mentioned in your request appears broken: %s. "
                     "Please check the URL and try again.\n\n"
                     "Nevertheless, you can still browse the directory "
                     "without origin information: %s"
                     % (gen_link(origin_url), gen_link(raw_dir_url))
                 )
                 raise NotFoundExc(error_message)
             else:
                 raise e
 
     path_info = gen_path_info(path)
 
     query_params = snapshot_context["query_params"] if snapshot_context else {}
 
     breadcrumbs = []
     breadcrumbs.append(
         {
             "name": root_sha1_git[:7],
             "url": reverse(
                 "browse-directory",
                 url_args={"sha1_git": root_sha1_git},
                 query_params={**query_params, "path": None},
             ),
         }
     )
 
     for pi in path_info:
         breadcrumbs.append(
             {
                 "name": pi["name"],
                 "url": reverse(
                     "browse-directory",
                     url_args={"sha1_git": root_sha1_git},
                     query_params={
                         **query_params,
                         "path": pi["path"],
                     },
                 ),
             }
         )
 
     path = "" if path is None else (path + "/")
 
     for d in dirs:
         if d["type"] == "rev":
             d["url"] = reverse(
                 "browse-revision",
                 url_args={"sha1_git": d["target"]},
                 query_params=query_params,
             )
         else:
             d["url"] = reverse(
                 "browse-directory",
                 url_args={"sha1_git": root_sha1_git},
                 query_params={
                     **query_params,
                     "path": path + d["name"],
                 },
             )
 
     sum_file_sizes = 0
 
     readmes = {}
 
     for f in files:
         query_string = "sha1_git:" + f["target"]
         f["url"] = reverse(
             "browse-content",
             url_args={"query_string": query_string},
             query_params={
                 **query_params,
                 "path": root_sha1_git + "/" + path + f["name"],
             },
         )
         if f["length"] is not None:
             sum_file_sizes += f["length"]
         if f["name"].lower().startswith("readme"):
             readmes[f["name"]] = f["checksums"]["sha1"]
 
     readme_name, readme_url, readme_html = get_readme_to_display(readmes)
 
     dir_metadata = DirectoryMetadata(
         object_type=ObjectType.DIRECTORY,
         object_id=dir_sha1_git,
         directory=root_sha1_git,
         nb_files=len(files),
         nb_dirs=len(dirs),
         sum_file_sizes=sum_file_sizes,
         root_directory=root_sha1_git,
         path=f"/{path}" if path else None,
         revision=None,
         revision_found=None,
         release=None,
         snapshot=None,
     )
 
     vault_cooking = {
         "directory_context": True,
         "directory_swhid": f"swh:1:dir:{dir_sha1_git}",
         "revision_context": False,
         "revision_swhid": None,
     }
 
     swh_objects = [
         SWHObjectInfo(object_type=ObjectType.DIRECTORY, object_id=dir_sha1_git)
     ]
 
     if snapshot_context:
         if snapshot_context["revision_id"]:
             swh_objects.append(
                 SWHObjectInfo(
                     object_type=ObjectType.REVISION,
                     object_id=snapshot_context["revision_id"],
                 )
             )
         swh_objects.append(
             SWHObjectInfo(
                 object_type=ObjectType.SNAPSHOT,
                 object_id=snapshot_context["snapshot_id"],
             )
         )
         if snapshot_context["release_id"]:
             swh_objects.append(
                 SWHObjectInfo(
                     object_type=ObjectType.RELEASE,
                     object_id=snapshot_context["release_id"],
                 )
             )
 
     swhids_info = get_swhids_info(swh_objects, snapshot_context, dir_metadata)
 
     heading = "Directory - %s" % dir_sha1_git
     if breadcrumbs:
         dir_path = "/".join([bc["name"] for bc in breadcrumbs]) + "/"
         heading += " - %s" % dir_path
 
     top_right_link = None
     if (
         snapshot_context is not None
         and not snapshot_context["is_empty"]
         and snapshot_context["revision_id"] is not None
     ):
         history_url = reverse(
             "browse-revision-log",
             url_args={"sha1_git": snapshot_context["revision_id"]},
             query_params=query_params,
         )
         top_right_link = {
             "url": history_url,
             "icon": swh_object_icons["revisions history"],
             "text": "History",
         }
 
     return render(
         request,
-        "browse/directory.html",
+        "browse-directory.html",
         {
             "heading": heading,
             "swh_object_id": swhids_info[0]["swhid"],
             "swh_object_name": "Directory",
             "swh_object_metadata": dir_metadata,
             "dirs": dirs,
             "files": files,
             "breadcrumbs": breadcrumbs,
             "top_right_link": top_right_link,
             "readme_name": readme_name,
             "readme_url": readme_url,
             "readme_html": readme_html,
             "snapshot_context": snapshot_context,
             "vault_cooking": vault_cooking,
             "show_actions": True,
             "swhids_info": swhids_info,
             "error_code": error_info["status_code"],
             "error_message": http_status_code_message.get(error_info["status_code"]),
             "error_description": error_info["description"],
         },
         status=error_info["status_code"],
     )
 
 
 @browse_route(
     r"directory/(?P<sha1_git>[0-9a-f]+)/",
     view_name="browse-directory",
     checksum_args=["sha1_git"],
 )
 def directory_browse(request: HttpRequest, sha1_git: str) -> HttpResponse:
     """Django view for browsing the content of a directory identified
     by its sha1_git value.
 
     The url that points to it is
     :http:get:`/browse/directory/(sha1_git)/`
     """
     return _directory_browse(request, sha1_git, request.GET.get("path"))
 
 
 @browse_route(
     r"directory/(?P<sha1_git>[0-9a-f]+)/(?P<path>.+)/",
     view_name="browse-directory-legacy",
     checksum_args=["sha1_git"],
 )
 def directory_browse_legacy(
     request: HttpRequest, sha1_git: str, path: str
 ) -> HttpResponse:
     """Django view for browsing the content of a directory identified
     by its sha1_git value.
 
     The url that points to it is
     :http:get:`/browse/directory/(sha1_git)/(path)/`
     """
     return _directory_browse(request, sha1_git, path)
 
 
 @browse_route(
     r"directory/resolve/content-path/(?P<sha1_git>[0-9a-f]+)/",
     view_name="browse-directory-resolve-content-path",
     checksum_args=["sha1_git"],
 )
 def _directory_resolve_content_path(
     request: HttpRequest, sha1_git: str
 ) -> HttpResponse:
     """
     Internal endpoint redirecting to data url for a specific file path
     relative to a root directory.
     """
     try:
         path = os.path.normpath(request.GET.get("path", ""))
         if not path.startswith("../"):
             dir_info = archive.lookup_directory_with_path(sha1_git, path)
             if dir_info["type"] == "file":
                 sha1 = dir_info["checksums"]["sha1"]
                 data_url = reverse(
                     "browse-content-raw", url_args={"query_string": sha1}
                 )
                 return redirect(data_url)
     except Exception as exc:
         sentry_capture_exception(exc)
     return HttpResponse(status=404)
diff --git a/swh/web/browse/views/origin.py b/swh/web/browse/views/origin.py
index 63c4817b..3c7ef0c8 100644
--- a/swh/web/browse/views/origin.py
+++ b/swh/web/browse/views/origin.py
@@ -1,332 +1,332 @@
 # Copyright (C) 2021-2022 The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from typing import Any, Dict, List, Optional, cast
 
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import redirect, render
 
 from swh.web.browse.browseurls import browse_route
 from swh.web.browse.snapshot_context import (
     browse_snapshot_directory,
     get_snapshot_context,
 )
 from swh.web.utils import (
     archive,
     format_utc_iso_date,
     parse_iso8601_date_to_utc,
     redirect_to_new_route,
     reverse,
 )
 from swh.web.utils.exc import BadInputExc
 from swh.web.utils.origin_visits import get_origin_visits
 
 
 @browse_route(
     r"origin/directory/",
     view_name="browse-origin-directory",
 )
 def origin_directory_browse(request: HttpRequest) -> HttpResponse:
     """Django view for browsing the content of a directory associated
     to an origin for a given visit.
 
     The URL that points to it is :http:get:`/browse/origin/directory/`
     """
     return browse_snapshot_directory(
         request,
         origin_url=request.GET.get("origin_url"),
         snapshot_id=request.GET.get("snapshot"),
         timestamp=request.GET.get("timestamp"),
         path=request.GET.get("path"),
     )
 
 
 @browse_route(
     r"origin/(?P<origin_url>.+)/visit/(?P<timestamp>.+)/directory/",
     r"origin/(?P<origin_url>.+)/visit/(?P<timestamp>.+)/directory/(?P<path>.+)/",
     r"origin/(?P<origin_url>.+)/directory/(?P<path>.+)/",
     r"origin/(?P<origin_url>.+)/directory/",
     view_name="browse-origin-directory-legacy",
 )
 def origin_directory_browse_legacy(
     request: HttpRequest,
     origin_url: str,
     timestamp: Optional[str] = None,
     path: Optional[str] = None,
 ) -> HttpResponse:
     """Django view for browsing the content of a directory associated
     to an origin for a given visit.
 
     The URLs that point to it are
     :http:get:`/browse/origin/(origin_url)/directory/[(path)/]` and
     :http:get:`/browse/origin/(origin_url)/visit/(timestamp)/directory/[(path)/]`
     """
     return browse_snapshot_directory(
         request,
         origin_url=origin_url,
         snapshot_id=request.GET.get("snapshot"),
         timestamp=timestamp,
         path=path,
     )
 
 
 @browse_route(
     r"origin/content/",
     view_name="browse-origin-content",
 )
 def origin_content_browse(request: HttpRequest) -> HttpResponse:
     """
     This route is deprecated; use http:get:`/browse/content` instead
 
     Django view that produces an HTML display of a content
     associated to an origin for a given visit.
 
     The URL that points to it is :http:get:`/browse/origin/content/`
 
     """
     return redirect_to_new_route(request, "browse-content")
 
 
 @browse_route(
     r"origin/(?P<origin_url>.+)/visit/(?P<timestamp>.+)/content/(?P<path>.+)/",
     r"origin/(?P<origin_url>.+)/content/(?P<path>.+)/",
     r"origin/(?P<origin_url>.+)/content/",
     view_name="browse-origin-content-legacy",
 )
 def origin_content_browse_legacy(
     request: HttpRequest,
     origin_url: str,
     path: Optional[str] = None,
     timestamp: Optional[str] = None,
 ) -> HttpResponse:
     """
     This route is deprecated; use http:get:`/browse/content` instead
 
     Django view that produces an HTML display of a content
     associated to an origin for a given visit.
 
     The URLs that point to it are
     :http:get:`/browse/origin/(origin_url)/content/(path)/` and
     :http:get:`/browse/origin/(origin_url)/visit/(timestamp)/content/(path)/`
 
     """
     return redirect_to_new_route(request, "browse-content")
 
 
 @browse_route(
     r"origin/log/",
     view_name="browse-origin-log",
 )
 def origin_log_browse(request: HttpRequest) -> HttpResponse:
     """
     This route is deprecated; use http:get:`/browse/snapshot/log` instead
 
     Django view that produces an HTML display of revisions history (aka
     the commit log) associated to a software origin.
 
     The URL that points to it is :http:get:`/browse/origin/log/`
     """
     return redirect_to_new_route(request, "browse-snapshot-log")
 
 
 @browse_route(
     r"origin/(?P<origin_url>.+)/visit/(?P<timestamp>.+)/log/",
     r"origin/(?P<origin_url>.+)/log/",
     view_name="browse-origin-log-legacy",
 )
 def origin_log_browse_legacy(
     request: HttpRequest, origin_url: str, timestamp: Optional[str] = None
 ) -> HttpResponse:
     """
     This route is deprecated; use http:get:`/browse/snapshot/log` instead
 
     Django view that produces an HTML display of revisions history (aka
     the commit log) associated to a software origin.
 
     The URLs that point to it are
     :http:get:`/browse/origin/(origin_url)/log/` and
     :http:get:`/browse/origin/(origin_url)/visit/(timestamp)/log/`
 
     """
     return redirect_to_new_route(
         request,
         "browse-snapshot-log",
     )
 
 
 @browse_route(
     r"origin/branches/",
     view_name="browse-origin-branches",
 )
 def origin_branches_browse(request: HttpRequest) -> HttpResponse:
     """
     This route is deprecated; use http:get:`/browse/snapshot/branches` instead
 
     Django view that produces an HTML display of the list of branches
     associated to an origin for a given visit.
 
     The URL that points to it is :http:get:`/browse/origin/branches/`
 
     """
     return redirect_to_new_route(request, "browse-snapshot-branches")
 
 
 @browse_route(
     r"origin/(?P<origin_url>.+)/visit/(?P<timestamp>.+)/branches/",
     r"origin/(?P<origin_url>.+)/branches/",
     view_name="browse-origin-branches-legacy",
 )
 def origin_branches_browse_legacy(
     request: HttpRequest, origin_url: str, timestamp: Optional[str] = None
 ) -> HttpResponse:
     """
     This route is deprecated; use http:get:`/browse/snapshot/branches` instead
 
     Django view that produces an HTML display of the list of branches
     associated to an origin for a given visit.
 
     The URLs that point to it are
     :http:get:`/browse/origin/(origin_url)/branches/` and
     :http:get:`/browse/origin/(origin_url)/visit/(timestamp)/branches/`
 
     """
     return redirect_to_new_route(request, "browse-snapshot-branches")
 
 
 @browse_route(
     r"origin/releases/",
     view_name="browse-origin-releases",
 )
 def origin_releases_browse(request: HttpRequest) -> HttpResponse:
     """
     This route is deprecated; use http:get:`/browse/snapshot/releases` instead
 
     Django view that produces an HTML display of the list of releases
     associated to an origin for a given visit.
 
     The URL that points to it is :http:get:`/browse/origin/releases/`
 
     """
     return redirect_to_new_route(request, "browse-snapshot-releases")
 
 
 @browse_route(
     r"origin/(?P<origin_url>.+)/visit/(?P<timestamp>.+)/releases/",
     r"origin/(?P<origin_url>.+)/releases/",
     view_name="browse-origin-releases-legacy",
 )
 def origin_releases_browse_legacy(
     request: HttpRequest, origin_url: str, timestamp: Optional[str] = None
 ) -> HttpResponse:
     """
     This route is deprecated; use http:get:`/browse/snapshot/releases` instead
 
     Django view that produces an HTML display of the list of releases
     associated to an origin for a given visit.
 
     The URLs that point to it are
     :http:get:`/browse/origin/(origin_url)/releases/` and
     :http:get:`/browse/origin/(origin_url)/visit/(timestamp)/releases/`
 
     """
     return redirect_to_new_route(request, "browse-snapshot-releases")
 
 
 def _origin_visits_browse(
     request: HttpRequest, origin_url: Optional[str]
 ) -> HttpResponse:
     if origin_url is None:
         raise BadInputExc("An origin URL must be provided as query parameter.")
 
     origin_info = archive.lookup_origin({"url": origin_url})
     origin_visits = cast(List[Dict[str, Any]], get_origin_visits(origin_info))
 
     snapshot_context = get_snapshot_context(origin_url=origin_url)
 
     for i, visit in enumerate(origin_visits):
         url_date = format_utc_iso_date(visit["date"], "%Y-%m-%dT%H:%M:%SZ")
         visit["formatted_date"] = format_utc_iso_date(visit["date"])
         query_params = {"origin_url": origin_url, "timestamp": url_date}
         if i < len(origin_visits) - 1:
             if visit["date"] == origin_visits[i + 1]["date"]:
                 query_params = {"visit_id": visit["visit"]}
         if i > 0:
             if visit["date"] == origin_visits[i - 1]["date"]:
                 query_params = {"visit_id": visit["visit"]}
 
         snapshot = visit["snapshot"] if visit["snapshot"] else ""
 
         visit["url"] = reverse(
             "browse-origin-directory",
             query_params=query_params,
         )
         if not snapshot:
             visit["snapshot"] = ""
         visit["date"] = parse_iso8601_date_to_utc(visit["date"]).timestamp()
 
     heading = "Origin visits - %s" % origin_url
 
     return render(
         request,
-        "browse/origin-visits.html",
+        "browse-origin-visits.html",
         {
             "heading": heading,
             "swh_object_name": "Visits",
             "swh_object_metadata": origin_info,
             "origin_visits": origin_visits,
             "origin_info": origin_info,
             "snapshot_context": snapshot_context,
             "vault_cooking": None,
             "show_actions": False,
         },
     )
 
 
 @browse_route(r"origin/visits/", view_name="browse-origin-visits")
 def origin_visits_browse(request: HttpRequest) -> HttpResponse:
     """Django view that produces an HTML display of visits reporting
     for a given origin.
 
     The URL that points to it is
     :http:get:`/browse/origin/visits/`.
     """
     return _origin_visits_browse(request, request.GET.get("origin_url"))
 
 
 @browse_route(
     r"origin/(?P<origin_url>.+)/visits/", view_name="browse-origin-visits-legacy"
 )
 def origin_visits_browse_legacy(request: HttpRequest, origin_url: str) -> HttpResponse:
     """Django view that produces an HTML display of visits reporting
     for a given origin.
 
     The URL that points to it is
     :http:get:`/browse/origin/(origin_url)/visits/`.
     """
     return _origin_visits_browse(request, origin_url)
 
 
 @browse_route(r"origin/", view_name="browse-origin")
 def origin_browse(request: HttpRequest) -> HttpResponse:
     """Django view that redirects to the display of the latest archived
     snapshot for a given software origin.
     """
     last_snapshot_url = reverse(
         "browse-origin-directory",
         query_params=request.GET,
     )
     return redirect(last_snapshot_url)
 
 
 @browse_route(r"origin/(?P<origin_url>.+)/", view_name="browse-origin-legacy")
 def origin_browse_legacy(request: HttpRequest, origin_url: str) -> HttpResponse:
     """Django view that redirects to the display of the latest archived
     snapshot for a given software origin.
     """
     last_snapshot_url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": origin_url, **request.GET},
     )
     return redirect(last_snapshot_url)
diff --git a/swh/web/browse/views/release.py b/swh/web/browse/views/release.py
index d41d6a91..1a811a9c 100644
--- a/swh/web/browse/views/release.py
+++ b/swh/web/browse/views/release.py
@@ -1,246 +1,246 @@
 # Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 from typing import Optional
 
 from django.http import HttpRequest, HttpResponse
 from django.shortcuts import render
 
 from swh.model.swhids import ObjectType
 from swh.web.browse.browseurls import browse_route
 from swh.web.browse.snapshot_context import get_snapshot_context
 from swh.web.browse.utils import (
     gen_content_link,
     gen_directory_link,
     gen_link,
     gen_person_mail_link,
     gen_release_link,
     gen_revision_link,
 )
 from swh.web.utils import archive, format_utc_iso_date, reverse
 from swh.web.utils.exc import NotFoundExc, sentry_capture_exception
 from swh.web.utils.identifiers import get_swhids_info
 from swh.web.utils.typing import ReleaseMetadata, SnapshotContext, SWHObjectInfo
 
 
 @browse_route(
     r"release/(?P<sha1_git>[0-9a-f]+)/",
     view_name="browse-release",
     checksum_args=["sha1_git"],
 )
 def release_browse(request: HttpRequest, sha1_git: str) -> HttpResponse:
     """
     Django view that produces an HTML display of a release
     identified by its id.
 
     The url that points to it is :http:get:`/browse/release/(sha1_git)/`.
     """
     release = archive.lookup_release(sha1_git)
     snapshot_context: Optional[SnapshotContext] = None
     origin_info = None
     snapshot_id = request.GET.get("snapshot_id")
     if not snapshot_id:
         snapshot_id = request.GET.get("snapshot")
     origin_url = request.GET.get("origin_url")
     if not origin_url:
         origin_url = request.GET.get("origin")
     timestamp = request.GET.get("timestamp")
     visit_id = int(request.GET.get("visit_id", 0))
     if origin_url:
         try:
             snapshot_context = get_snapshot_context(
                 snapshot_id,
                 origin_url,
                 timestamp,
                 visit_id or None,
                 release_name=release["name"],
             )
         except NotFoundExc as e:
             raw_rel_url = reverse("browse-release", url_args={"sha1_git": sha1_git})
             error_message = (
                 "The Software Heritage archive has a release "
                 "with the hash you provided but the origin "
                 "mentioned in your request appears broken: %s. "
                 "Please check the URL and try again.\n\n"
                 "Nevertheless, you can still browse the release "
                 "without origin information: %s"
                 % (gen_link(origin_url), gen_link(raw_rel_url))
             )
             if str(e).startswith("Origin"):
                 raise NotFoundExc(error_message)
             else:
                 raise e
         origin_info = snapshot_context["origin_info"]
     elif snapshot_id:
         snapshot_context = get_snapshot_context(
             snapshot_id, release_name=release["name"]
         )
 
     if snapshot_context is not None:
         snapshot_id = snapshot_context.get("snapshot_id", None)
 
     release_metadata = ReleaseMetadata(
         object_type=ObjectType.RELEASE,
         object_id=sha1_git,
         release=sha1_git,
         author=release["author"]["fullname"] if release["author"] else "None",
         author_url=gen_person_mail_link(release["author"])
         if release["author"]
         else "None",
         date=format_utc_iso_date(release["date"]),
         name=release["name"],
         synthetic=release["synthetic"],
         target=release["target"],
         target_type=release["target_type"],
         snapshot=snapshot_id,
         origin_url=origin_url,
     )
 
     release_note_lines = []
     if release["message"]:
         release_note_lines = release["message"].split("\n")
 
     swh_objects = [SWHObjectInfo(object_type=ObjectType.RELEASE, object_id=sha1_git)]
 
     vault_cooking = None
 
     rev_directory = None
     target_link = None
     if release["target_type"] == ObjectType.REVISION.name.lower():
         target_link = gen_revision_link(
             release["target"],
             snapshot_context=snapshot_context,
             link_text=None,
             link_attrs=None,
         )
         try:
             revision = archive.lookup_revision(release["target"])
             rev_directory = revision["directory"]
             vault_cooking = {
                 "directory_context": True,
                 "directory_swhid": f"swh:1:dir:{rev_directory}",
                 "revision_context": True,
                 "revision_swhid": f"swh:1:rev:{release['target']}",
             }
             swh_objects.append(
                 SWHObjectInfo(
                     object_type=ObjectType.REVISION, object_id=release["target"]
                 )
             )
             swh_objects.append(
                 SWHObjectInfo(object_type=ObjectType.DIRECTORY, object_id=rev_directory)
             )
         except Exception as exc:
             sentry_capture_exception(exc)
     elif release["target_type"] == ObjectType.DIRECTORY.name.lower():
         target_link = gen_directory_link(
             release["target"],
             snapshot_context=snapshot_context,
             link_text=None,
             link_attrs=None,
         )
         try:
             # check directory exists
             archive.lookup_directory(release["target"])
             vault_cooking = {
                 "directory_context": True,
                 "directory_swhid": f"swh:1:dir:{release['target']}",
                 "revision_context": False,
                 "revision_swhid": None,
             }
             swh_objects.append(
                 SWHObjectInfo(
                     object_type=ObjectType.DIRECTORY, object_id=release["target"]
                 )
             )
         except Exception as exc:
             sentry_capture_exception(exc)
     elif release["target_type"] == ObjectType.CONTENT.name.lower():
         target_link = gen_content_link(
             release["target"],
             snapshot_context=snapshot_context,
             link_text=None,
             link_attrs=None,
         )
         swh_objects.append(
             SWHObjectInfo(object_type=ObjectType.CONTENT, object_id=release["target"])
         )
     elif release["target_type"] == ObjectType.RELEASE.name.lower():
         target_link = gen_release_link(
             release["target"],
             snapshot_context=snapshot_context,
             link_text=None,
             link_attrs=None,
         )
 
     rev_directory_url = None
     if rev_directory is not None:
         if origin_info:
             rev_directory_url = reverse(
                 "browse-origin-directory",
                 query_params={
                     "origin_url": origin_info["url"],
                     "release": release["name"],
                     "snapshot": snapshot_id,
                 },
             )
         elif snapshot_id:
             rev_directory_url = reverse(
                 "browse-snapshot-directory",
                 url_args={"snapshot_id": snapshot_id},
                 query_params={"release": release["name"]},
             )
         else:
             rev_directory_url = reverse(
                 "browse-directory", url_args={"sha1_git": rev_directory}
             )
 
     directory_link = None
     if rev_directory_url is not None:
         directory_link = gen_link(rev_directory_url, rev_directory)
     release["directory_link"] = directory_link
     release["target_link"] = target_link
 
     if snapshot_context:
         snapshot_id = snapshot_context["snapshot_id"]
 
     if snapshot_id:
         swh_objects.append(
             SWHObjectInfo(object_type=ObjectType.SNAPSHOT, object_id=snapshot_id)
         )
 
     swhids_info = get_swhids_info(swh_objects, snapshot_context)
 
     note_header = "None"
     if len(release_note_lines) > 0:
         note_header = release_note_lines[0]
 
     release["note_header"] = note_header
     release["note_body"] = "\n".join(release_note_lines[1:])
 
     heading = "Release - %s" % release["name"]
     if snapshot_context:
         context_found = "snapshot: %s" % snapshot_context["snapshot_id"]
         if origin_info:
             context_found = "origin: %s" % origin_info["url"]
         heading += " - %s" % context_found
 
     return render(
         request,
-        "browse/release.html",
+        "browse-release.html",
         {
             "heading": heading,
             "swh_object_id": swhids_info[0]["swhid"],
             "swh_object_name": "Release",
             "swh_object_metadata": release_metadata,
             "release": release,
             "snapshot_context": snapshot_context,
             "show_actions": True,
             "breadcrumbs": None,
             "vault_cooking": vault_cooking,
             "top_right_link": None,
             "swhids_info": swhids_info,
         },
     )
diff --git a/swh/web/browse/views/revision.py b/swh/web/browse/views/revision.py
index 14a5820b..a78f721e 100644
--- a/swh/web/browse/views/revision.py
+++ b/swh/web/browse/views/revision.py
@@ -1,600 +1,600 @@
 # Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import hashlib
 import json
 import textwrap
 from typing import Any, Dict, List, Optional
 
 from django.http import HttpRequest, HttpResponse, JsonResponse
 from django.shortcuts import render
 from django.utils.safestring import mark_safe
 
 from swh.model.hashutil import hash_to_bytes
 from swh.model.swhids import CoreSWHID, ObjectType
 from swh.web.browse.browseurls import browse_route
 from swh.web.browse.snapshot_context import get_snapshot_context
 from swh.web.browse.utils import (
     content_display_max_size,
     format_log_entries,
     gen_link,
     gen_person_mail_link,
     gen_revision_url,
     get_directory_entries,
     get_readme_to_display,
     get_revision_log_url,
     prepare_content_for_display,
     request_content,
 )
 from swh.web.utils import (
     archive,
     format_utc_iso_date,
     gen_path_info,
     reverse,
     swh_object_icons,
 )
 from swh.web.utils.exc import NotFoundExc, http_status_code_message
 from swh.web.utils.identifiers import get_swhids_info
 from swh.web.utils.typing import RevisionMetadata, SnapshotContext, SWHObjectInfo
 
 
 def _gen_content_url(
     revision: Dict[str, Any],
     query_string: str,
     path: str,
     snapshot_context: Optional[SnapshotContext],
 ) -> str:
     if snapshot_context:
         query_params = snapshot_context["query_params"]
         query_params["path"] = path
         query_params["revision"] = revision["id"]
         content_url = reverse("browse-origin-content", query_params=query_params)
     else:
         content_path = "%s/%s" % (revision["directory"], path)
         content_url = reverse(
             "browse-content",
             url_args={"query_string": query_string},
             query_params={"path": content_path},
         )
     return content_url
 
 
 def _gen_diff_link(idx: int, diff_anchor: str, link_text: str) -> str:
     if idx < _max_displayed_file_diffs:
         return gen_link(diff_anchor, link_text)
     else:
         return link_text
 
 
 # TODO: put in conf
 _max_displayed_file_diffs = 1000
 
 
 def _gen_revision_changes_list(
     revision: Dict[str, Any],
     changes: List[Dict[str, Any]],
     snapshot_context: Optional[SnapshotContext],
 ) -> str:
     """
     Returns a HTML string describing the file changes
     introduced in a revision.
     As this string will be displayed in the browse revision view,
     links to adequate file diffs are also generated.
 
     Args:
         revision (str): hexadecimal representation of a revision identifier
         changes (list): list of file changes in the revision
         snapshot_context (dict): optional origin context used to reverse
             the content urls
 
     Returns:
         A string to insert in a revision HTML view.
 
     """
     changes_msg = []
     for i, change in enumerate(changes):
         hasher = hashlib.sha1()
         from_query_string = ""
         to_query_string = ""
         diff_id = "diff-"
         if change["from"]:
             from_query_string = "sha1_git:" + change["from"]["target"]
             diff_id += change["from"]["target"] + "-" + change["from_path"]
         diff_id += "-"
         if change["to"]:
             to_query_string = "sha1_git:" + change["to"]["target"]
             diff_id += change["to"]["target"] + change["to_path"]
         change["path"] = change["to_path"] or change["from_path"]
         url_args = {
             "from_query_string": from_query_string,
             "to_query_string": to_query_string,
         }
         query_params = {"path": change["path"]}
         change["diff_url"] = reverse(
             "diff-contents", url_args=url_args, query_params=query_params
         )
 
         hasher.update(diff_id.encode("utf-8"))
         diff_id = hasher.hexdigest()
         change["id"] = diff_id
         diff_link = "#diff_" + diff_id
 
         if change["type"] == "modify":
             change["content_url"] = _gen_content_url(
                 revision, to_query_string, change["to_path"], snapshot_context
             )
             changes_msg.append(
                 "modified:  %s" % _gen_diff_link(i, diff_link, change["to_path"])
             )
         elif change["type"] == "insert":
             change["content_url"] = _gen_content_url(
                 revision, to_query_string, change["to_path"], snapshot_context
             )
             changes_msg.append(
                 "new file:  %s" % _gen_diff_link(i, diff_link, change["to_path"])
             )
         elif change["type"] == "delete":
             parent = archive.lookup_revision(revision["parents"][0])
             change["content_url"] = _gen_content_url(
                 parent, from_query_string, change["from_path"], snapshot_context
             )
             changes_msg.append(
                 "deleted:   %s" % _gen_diff_link(i, diff_link, change["from_path"])
             )
         elif change["type"] == "rename":
             change["content_url"] = _gen_content_url(
                 revision, to_query_string, change["to_path"], snapshot_context
             )
             link_text = change["from_path"] + " &rarr; " + change["to_path"]
             changes_msg.append(
                 "renamed:   %s" % _gen_diff_link(i, diff_link, link_text)
             )
     if not changes:
         changes_msg.append("No changes")
     return mark_safe("\n".join(changes_msg))
 
 
 @browse_route(
     r"revision/(?P<sha1_git>[0-9a-f]+)/diff/",
     view_name="diff-revision",
     checksum_args=["sha1_git"],
 )
 def _revision_diff(request: HttpRequest, sha1_git: str) -> HttpResponse:
     """
     Browse internal endpoint to compute revision diff
     """
     revision = archive.lookup_revision(sha1_git)
     snapshot_context = None
     origin_url = request.GET.get("origin_url", None)
     if not origin_url:
         origin_url = request.GET.get("origin", None)
     timestamp = request.GET.get("timestamp", None)
     visit_id_str = request.GET.get("visit_id", None)
     visit_id = int(visit_id_str) if visit_id_str is not None else None
     if origin_url:
         snapshot_context = get_snapshot_context(
             origin_url=origin_url, timestamp=timestamp, visit_id=visit_id
         )
 
     changes = archive.diff_revision(sha1_git)
     changes_msg = _gen_revision_changes_list(revision, changes, snapshot_context)
 
     diff_data = {
         "total_nb_changes": len(changes),
         "changes": changes[:_max_displayed_file_diffs],
         "changes_msg": changes_msg,
     }
     return JsonResponse(diff_data)
 
 
 NB_LOG_ENTRIES = 100
 
 
 @browse_route(
     r"revision/(?P<sha1_git>[0-9a-f]+)/log/",
     view_name="browse-revision-log",
     checksum_args=["sha1_git"],
 )
 def revision_log_browse(request: HttpRequest, sha1_git: str) -> HttpResponse:
     """
     Django view that produces an HTML display of the history
     log for a revision identified by its id.
 
     The url that points to it is :http:get:`/browse/revision/(sha1_git)/log/`
     """
     origin_url = request.GET.get("origin_url")
     snapshot_id = request.GET.get("snapshot")
     snapshot_context = None
     if origin_url or snapshot_id:
         visit_id = int(request.GET.get("visit_id", 0))
         snapshot_context = get_snapshot_context(
             snapshot_id=snapshot_id,
             origin_url=origin_url,
             timestamp=request.GET.get("timestamp"),
             visit_id=visit_id or None,
             branch_name=request.GET.get("branch"),
             release_name=request.GET.get("release"),
             revision_id=sha1_git,
         )
     per_page = int(request.GET.get("per_page", NB_LOG_ENTRIES))
     offset = int(request.GET.get("offset", 0))
     revs_ordering = request.GET.get("revs_ordering", "committer_date")
     session_key = "rev_%s_log_ordering_%s" % (sha1_git, revs_ordering)
     rev_log_session = request.session.get(session_key, None)
     rev_log = []
     revs_walker_state = None
     if rev_log_session:
         rev_log = rev_log_session["rev_log"]
         revs_walker_state = rev_log_session["revs_walker_state"]
 
     if len(rev_log) < offset + per_page:
         revs_walker = archive.get_revisions_walker(
             revs_ordering,
             sha1_git,
             max_revs=offset + per_page + 1,
             state=revs_walker_state,
         )
 
         rev_log += [rev["id"] for rev in revs_walker]
         revs_walker_state = revs_walker.export_state()
 
     revs = rev_log[offset : offset + per_page]
     revision_log = archive.lookup_revision_multiple(revs)
 
     request.session[session_key] = {
         "rev_log": rev_log,
         "revs_walker_state": revs_walker_state,
     }
 
     revs_ordering = request.GET.get("revs_ordering", "")
 
     prev_log_url = None
     if len(rev_log) > offset + per_page:
         prev_log_url = reverse(
             "browse-revision-log",
             url_args={"sha1_git": sha1_git},
             query_params={
                 "per_page": str(per_page),
                 "offset": str(offset + per_page),
                 "revs_ordering": revs_ordering or None,
             },
         )
 
     next_log_url = None
     if offset != 0:
         next_log_url = reverse(
             "browse-revision-log",
             url_args={"sha1_git": sha1_git},
             query_params={
                 "per_page": str(per_page),
                 "offset": str(offset - per_page),
                 "revs_ordering": revs_ordering or None,
             },
         )
 
     revision_log_data = format_log_entries(revision_log, per_page)
 
     swh_rev_id = str(
         CoreSWHID(object_type=ObjectType.REVISION, object_id=hash_to_bytes(sha1_git))
     )
 
     return render(
         request,
-        "browse/revision-log.html",
+        "browse-revision-log.html",
         {
             "heading": "Revision history",
             "swh_object_id": swh_rev_id,
             "swh_object_name": "Revisions history",
             "swh_object_metadata": None,
             "revision_log": revision_log_data,
             "revs_ordering": revs_ordering,
             "next_log_url": next_log_url,
             "prev_log_url": prev_log_url,
             "breadcrumbs": None,
             "top_right_link": None,
             "snapshot_context": snapshot_context,
             "vault_cooking": None,
             "show_actions": True,
             "swhids_info": None,
         },
     )
 
 
 @browse_route(
     r"revision/(?P<sha1_git>[0-9a-f]+)/",
     view_name="browse-revision",
     checksum_args=["sha1_git"],
 )
 def revision_browse(request: HttpRequest, sha1_git: str) -> HttpResponse:
     """
     Django view that produces an HTML display of a revision
     identified by its id.
 
     The url that points to it is :http:get:`/browse/revision/(sha1_git)/`.
     """
     revision = archive.lookup_revision(sha1_git)
     origin_info = None
     snapshot_context = None
     origin_url = request.GET.get("origin_url")
     if not origin_url:
         origin_url = request.GET.get("origin")
     timestamp = request.GET.get("timestamp")
     visit_id = int(request.GET.get("visit_id", 0))
     snapshot_id = request.GET.get("snapshot_id")
     if not snapshot_id:
         snapshot_id = request.GET.get("snapshot")
     path = request.GET.get("path")
     dir_id = None
     dirs, files = [], []
     content_data = {}
     if origin_url:
         try:
             snapshot_context = get_snapshot_context(
                 snapshot_id=snapshot_id,
                 origin_url=origin_url,
                 timestamp=timestamp,
                 visit_id=visit_id or None,
                 branch_name=request.GET.get("branch"),
                 release_name=request.GET.get("release"),
                 revision_id=sha1_git,
                 path=path,
             )
         except NotFoundExc as e:
             raw_rev_url = reverse("browse-revision", url_args={"sha1_git": sha1_git})
             error_message = (
                 "The Software Heritage archive has a revision "
                 "with the hash you provided but the origin "
                 "mentioned in your request appears broken: %s. "
                 "Please check the URL and try again.\n\n"
                 "Nevertheless, you can still browse the revision "
                 "without origin information: %s"
                 % (gen_link(origin_url), gen_link(raw_rev_url))
             )
             if str(e).startswith("Origin"):
                 raise NotFoundExc(error_message)
             else:
                 raise e
         origin_info = snapshot_context["origin_info"]
         snapshot_id = snapshot_context["snapshot_id"]
     elif snapshot_id:
         snapshot_context = get_snapshot_context(snapshot_id)
 
     error_info: Dict[str, Any] = {"status_code": 200, "description": None}
 
     if path:
         try:
             file_info = archive.lookup_directory_with_path(revision["directory"], path)
             if file_info["type"] == "dir":
                 dir_id = file_info["target"]
             else:
                 query_string = "sha1_git:" + file_info["target"]
                 content_data = request_content(query_string)
         except NotFoundExc as e:
             error_info["status_code"] = 404
             error_info["description"] = f"NotFoundExc: {str(e)}"
     else:
         dir_id = revision["directory"]
 
     if dir_id:
         path = "" if path is None else (path + "/")
         dirs, files = get_directory_entries(dir_id)
 
     revision_metadata = RevisionMetadata(
         object_type=ObjectType.REVISION,
         object_id=sha1_git,
         revision=sha1_git,
         author=revision["author"]["fullname"] if revision["author"] else "None",
         author_url=gen_person_mail_link(revision["author"])
         if revision["author"]
         else "None",
         committer=revision["committer"]["fullname"]
         if revision["committer"]
         else "None",
         committer_url=gen_person_mail_link(revision["committer"])
         if revision["committer"]
         else "None",
         committer_date=format_utc_iso_date(revision["committer_date"]),
         date=format_utc_iso_date(revision["date"]),
         directory=revision["directory"],
         merge=revision["merge"],
         metadata=json.dumps(
             revision["metadata"], sort_keys=True, indent=4, separators=(",", ": ")
         ),
         parents=revision["parents"],
         synthetic=revision["synthetic"],
         type=revision["type"],
         snapshot=snapshot_id,
         origin_url=origin_url,
     )
 
     message_lines = ["None"]
     if revision["message"]:
         message_lines = revision["message"].split("\n")
 
     parents = []
     for p in revision["parents"]:
         parent_url = gen_revision_url(p, snapshot_context)
         parents.append({"id": p, "url": parent_url})
 
     path_info = gen_path_info(path)
 
     query_params = snapshot_context["query_params"] if snapshot_context else {}
 
     breadcrumbs = []
     breadcrumbs.append(
         {
             "name": revision["directory"][:7],
             "url": reverse(
                 "browse-revision",
                 url_args={"sha1_git": sha1_git},
                 query_params=query_params,
             ),
         }
     )
     for pi in path_info:
         query_params["path"] = pi["path"]
         breadcrumbs.append(
             {
                 "name": pi["name"],
                 "url": reverse(
                     "browse-revision",
                     url_args={"sha1_git": sha1_git},
                     query_params=query_params,
                 ),
             }
         )
 
     vault_cooking = {
         "directory_context": False,
         "directory_swhid": None,
         "revision_context": True,
         "revision_swhid": f"swh:1:rev:{sha1_git}",
     }
 
     swh_objects = [SWHObjectInfo(object_type=ObjectType.REVISION, object_id=sha1_git)]
 
     content = None
     content_size = None
     filename = None
     mimetype = None
     language = None
     readme_name = None
     readme_url = None
     readme_html = None
     readmes = {}
 
     extra_context = dict(revision_metadata)
     extra_context["path"] = f"/{path}" if path else None
 
     if content_data:
         breadcrumbs[-1]["url"] = None
         content_size = content_data["length"]
         mimetype = content_data["mimetype"]
         if content_data["raw_data"]:
             content_display_data = prepare_content_for_display(
                 content_data["raw_data"], content_data["mimetype"], path
             )
             content = content_display_data["content_data"]
             language = content_display_data["language"]
             mimetype = content_display_data["mimetype"]
         if path:
             filename = path_info[-1]["name"]
             query_params["filename"] = filename
             filepath = "/".join(pi["name"] for pi in path_info[:-1])
             extra_context["path"] = f"/{filepath}/" if filepath else "/"
             extra_context["filename"] = filename
 
         top_right_link = {
             "url": reverse(
                 "browse-content-raw",
                 url_args={"query_string": query_string},
                 query_params={"filename": filename},
             ),
             "icon": swh_object_icons["content"],
             "text": "Raw File",
         }
 
         swh_objects.append(
             SWHObjectInfo(object_type=ObjectType.CONTENT, object_id=file_info["target"])
         )
     else:
         for d in dirs:
             if d["type"] == "rev":
                 d["url"] = reverse(
                     "browse-revision", url_args={"sha1_git": d["target"]}
                 )
             else:
                 query_params["path"] = path + d["name"]
                 d["url"] = reverse(
                     "browse-revision",
                     url_args={"sha1_git": sha1_git},
                     query_params=query_params,
                 )
         for f in files:
             query_params["path"] = path + f["name"]
             f["url"] = reverse(
                 "browse-revision",
                 url_args={"sha1_git": sha1_git},
                 query_params=query_params,
             )
             if f["name"].lower().startswith("readme"):
                 readmes[f["name"]] = f["checksums"]["sha1"]
 
         readme_name, readme_url, readme_html = get_readme_to_display(readmes)
 
         top_right_link = {
             "url": get_revision_log_url(sha1_git, snapshot_context),
             "icon": swh_object_icons["revisions history"],
             "text": "History",
         }
 
         vault_cooking["directory_context"] = True
         vault_cooking["directory_swhid"] = f"swh:1:dir:{dir_id}"
 
         swh_objects.append(
             SWHObjectInfo(object_type=ObjectType.DIRECTORY, object_id=dir_id)
         )
 
     query_params.pop("path", None)
 
     diff_revision_url = reverse(
         "diff-revision",
         url_args={"sha1_git": sha1_git},
         query_params=query_params,
     )
 
     if snapshot_id:
         swh_objects.append(
             SWHObjectInfo(object_type=ObjectType.SNAPSHOT, object_id=snapshot_id)
         )
 
     swhids_info = get_swhids_info(swh_objects, snapshot_context, extra_context)
 
     heading = "Revision - %s - %s" % (
         sha1_git[:7],
         textwrap.shorten(message_lines[0], width=70),
     )
     if snapshot_context:
         context_found = "snapshot: %s" % snapshot_context["snapshot_id"]
         if origin_info:
             context_found = "origin: %s" % origin_info["url"]
         heading += " - %s" % context_found
 
     return render(
         request,
-        "browse/revision.html",
+        "browse-revision.html",
         {
             "heading": heading,
             "swh_object_id": swhids_info[0]["swhid"],
             "swh_object_name": "Revision",
             "swh_object_metadata": revision_metadata,
             "message_header": message_lines[0],
             "message_body": "\n".join(message_lines[1:]),
             "parents": parents,
             "snapshot_context": snapshot_context,
             "dirs": dirs,
             "files": files,
             "content": content,
             "content_size": content_size,
             "max_content_size": content_display_max_size,
             "filename": filename,
             "encoding": content_data.get("encoding"),
             "mimetype": mimetype,
             "language": language,
             "readme_name": readme_name,
             "readme_url": readme_url,
             "readme_html": readme_html,
             "breadcrumbs": breadcrumbs,
             "top_right_link": top_right_link,
             "vault_cooking": vault_cooking,
             "diff_revision_url": diff_revision_url,
             "show_actions": True,
             "swhids_info": swhids_info,
             "error_code": error_info["status_code"],
             "error_message": http_status_code_message.get(error_info["status_code"]),
             "error_description": error_info["description"],
         },
         status=error_info["status_code"],
     )
diff --git a/swh/web/templates/browse/layout.html b/swh/web/templates/browse/layout.html
deleted file mode 100644
index ac1ade77..00000000
--- a/swh/web/templates/browse/layout.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "layout.html" %}
-
-{% comment %}
-Copyright (C) 2017-2019  The Software Heritage developers
-See the AUTHORS file at the top-level directory of this distribution
-License: GNU Affero General Public License version 3, or any later version
-See top-level LICENSE file for more information
-{% endcomment %}
-
-{% load swh_templatetags %}
-{% load render_bundle from webpack_loader %}
-
-{% block title %}{{ heading }} &ndash; Software Heritage archive {% endblock %}
-
-{% block header %}
-{% render_bundle 'browse' %}
-{% render_bundle 'vault' %}
-{% render_bundle 'save' %}
-{% endblock %}
-
-{% block content %}
-{% block browse-content %}{% endblock %}
-{% endblock %}
diff --git a/swh/web/tests/browse/views/test_content.py b/swh/web/tests/browse/views/test_content.py
index ef83cb18..2acd5cfa 100644
--- a/swh/web/tests/browse/views/test_content.py
+++ b/swh/web/tests/browse/views/test_content.py
@@ -1,1115 +1,1115 @@
-# Copyright (C) 2017-2021  The Software Heritage developers
+# Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 import re
 
 import pytest
 
 from django.utils.html import escape
 
 from swh.model.hashutil import hash_to_bytes
 from swh.model.model import ObjectType as ModelObjectType
 from swh.model.model import Release, Snapshot, SnapshotBranch, TargetType
 from swh.model.swhids import ObjectType
 from swh.web.browse.snapshot_context import process_snapshot_branches
 from swh.web.browse.utils import (
     get_mimetype_and_encoding_for_content,
     prepare_content_for_display,
     re_encode_content,
 )
 from swh.web.tests.data import get_content
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
 from swh.web.tests.helpers import check_html_get_response, check_http_get_response
 from swh.web.utils import (
     format_utc_iso_date,
     gen_path_info,
     parse_iso8601_date_to_utc,
     reverse,
 )
 from swh.web.utils.exc import NotFoundExc
 from swh.web.utils.identifiers import gen_swhid
 
 
 def test_content_view_text(client, archive_data, content_text):
     sha1_git = content_text["sha1_git"]
 
     url = reverse(
         "browse-content",
         url_args={"query_string": content_text["sha1"]},
         query_params={"path": content_text["path"]},
     )
 
     url_raw = reverse(
         "browse-content-raw", url_args={"query_string": content_text["sha1"]}
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     content_display = _process_content_for_display(archive_data, content_text)
     mimetype = content_display["mimetype"]
 
     if mimetype.startswith("text/"):
         assert_contains(resp, '<code class="%s">' % content_display["language"])
         assert_contains(resp, escape(content_display["content_data"]))
     assert_contains(resp, url_raw)
 
     swh_cnt_id = gen_swhid(ObjectType.CONTENT, sha1_git)
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
     assert_contains(resp, swh_cnt_id)
     assert_contains(resp, swh_cnt_id_url)
     assert_not_contains(resp, "swh-metadata-popover")
 
 
 def test_content_view_no_highlight(
     client, archive_data, content_application_no_highlight, content_text_no_highlight
 ):
     for content_ in (content_application_no_highlight, content_text_no_highlight):
         content = content_
         sha1_git = content["sha1_git"]
 
         url = reverse("browse-content", url_args={"query_string": content["sha1"]})
 
         url_raw = reverse(
             "browse-content-raw", url_args={"query_string": content["sha1"]}
         )
 
         resp = check_html_get_response(
-            client, url, status_code=200, template_used="browse/content.html"
+            client, url, status_code=200, template_used="browse-content.html"
         )
 
         content_display = _process_content_for_display(archive_data, content)
 
         if content["encoding"] != "binary":
             assert_contains(resp, '<code class="plaintext">')
             assert_contains(resp, escape(content_display["content_data"]))
 
         assert_contains(resp, url_raw)
 
         swh_cnt_id = gen_swhid(ObjectType.CONTENT, sha1_git)
         swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
 
         assert_contains(resp, swh_cnt_id)
         assert_contains(resp, swh_cnt_id_url)
 
 
 def test_content_view_no_utf8_text(client, archive_data, content_text_non_utf8):
     sha1_git = content_text_non_utf8["sha1_git"]
 
     url = reverse(
         "browse-content", url_args={"query_string": content_text_non_utf8["sha1"]}
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     content_display = _process_content_for_display(archive_data, content_text_non_utf8)
 
     swh_cnt_id = gen_swhid(ObjectType.CONTENT, sha1_git)
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
     assert_contains(resp, swh_cnt_id_url)
     assert_contains(resp, escape(content_display["content_data"]))
 
 
 def test_content_view_image(client, archive_data, content_image_type):
     url = reverse(
         "browse-content", url_args={"query_string": content_image_type["sha1"]}
     )
 
     url_raw = reverse(
         "browse-content-raw", url_args={"query_string": content_image_type["sha1"]}
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     content_display = _process_content_for_display(archive_data, content_image_type)
     mimetype = content_display["mimetype"]
     content_data = content_display["content_data"]
     assert_contains(resp, '<img src="data:%s;base64,%s"/>' % (mimetype, content_data))
     assert_contains(resp, url_raw)
 
 
 def test_content_view_image_no_rendering(
     client, archive_data, content_unsupported_image_type_rendering
 ):
     url = reverse(
         "browse-content",
         url_args={"query_string": content_unsupported_image_type_rendering["sha1"]},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     mimetype = content_unsupported_image_type_rendering["mimetype"]
     encoding = content_unsupported_image_type_rendering["encoding"]
     assert_contains(
         resp,
         (
             f"Content with mime type {mimetype} and encoding {encoding} "
             "cannot be displayed."
         ),
     )
 
 
 def test_content_view_text_with_path(client, archive_data, content_text):
     path = content_text["path"]
 
     url = reverse(
         "browse-content",
         url_args={"query_string": content_text["sha1"]},
         query_params={"path": path},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     assert_contains(resp, '<nav class="bread-crumbs')
 
     content_display = _process_content_for_display(archive_data, content_text)
     mimetype = content_display["mimetype"]
 
     if mimetype.startswith("text/"):
         hljs_language = content_text["hljs_language"]
         assert_contains(resp, '<code class="%s">' % hljs_language)
         assert_contains(resp, escape(content_display["content_data"]))
 
     split_path = path.split("/")
 
     root_dir_sha1 = split_path[0]
     filename = split_path[-1]
     path = path.replace(root_dir_sha1 + "/", "").replace(filename, "")
 
     swhid_context = {
         "anchor": gen_swhid(ObjectType.DIRECTORY, root_dir_sha1),
         "path": f"/{path}{filename}",
     }
 
     swh_cnt_id = gen_swhid(
         ObjectType.CONTENT, content_text["sha1_git"], metadata=swhid_context
     )
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
     assert_contains(resp, swh_cnt_id)
     assert_contains(resp, swh_cnt_id_url)
 
     path_info = gen_path_info(path)
 
     root_dir_url = reverse("browse-directory", url_args={"sha1_git": root_dir_sha1})
 
     assert_contains(resp, '<li class="swh-path">', count=len(path_info) + 1)
 
     assert_contains(
         resp, '<a href="' + root_dir_url + '">' + root_dir_sha1[:7] + "</a>"
     )
 
     for p in path_info:
         dir_url = reverse(
             "browse-directory",
             url_args={"sha1_git": root_dir_sha1},
             query_params={"path": p["path"]},
         )
         assert_contains(resp, '<a href="' + dir_url + '">' + p["name"] + "</a>")
 
     assert_contains(resp, "<li>" + filename + "</li>")
 
     url_raw = reverse(
         "browse-content-raw",
         url_args={"query_string": content_text["sha1"]},
         query_params={"filename": filename},
     )
     assert_contains(resp, url_raw)
 
     url = reverse(
         "browse-content",
         url_args={"query_string": content_text["sha1"]},
         query_params={"path": filename},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     assert_not_contains(resp, '<nav class="bread-crumbs')
 
     invalid_path = "%s/foo/bar/baz" % root_dir_sha1
     url = reverse(
         "browse-content",
         url_args={"query_string": content_text["sha1"]},
         query_params={"path": invalid_path},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
 
 
 def test_content_raw_text(client, archive_data, content_text):
     url = reverse("browse-content-raw", url_args={"query_string": content_text["sha1"]})
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="text/plain"
     )
 
     content_data = archive_data.content_get_data(content_text["sha1"])["data"]
 
     assert resp["Content-Type"] == "text/plain"
     assert resp["Content-disposition"] == (
         "filename=%s_%s" % ("sha1", content_text["sha1"])
     )
     assert resp.content == content_data
 
     filename = content_text["path"].split("/")[-1]
 
     url = reverse(
         "browse-content-raw",
         url_args={"query_string": content_text["sha1"]},
         query_params={"filename": filename},
     )
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="text/plain"
     )
 
     assert resp["Content-Type"] == "text/plain"
     assert resp["Content-disposition"] == "filename=%s" % filename
     assert resp.content == content_data
 
 
 def test_content_raw_no_utf8_text(client, content_text_non_utf8):
     url = reverse(
         "browse-content-raw", url_args={"query_string": content_text_non_utf8["sha1"]}
     )
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="text/plain"
     )
     _, encoding = get_mimetype_and_encoding_for_content(resp.content)
     assert encoding == content_text_non_utf8["encoding"]
 
 
 def test_content_raw_bin(client, archive_data, content_image_type):
     url = reverse(
         "browse-content-raw", url_args={"query_string": content_image_type["sha1"]}
     )
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="application/octet-stream"
     )
 
     filename = content_image_type["path"].split("/")[-1]
     content_data = archive_data.content_get_data(content_image_type["sha1"])["data"]
 
     assert resp["Content-Type"] == "application/octet-stream"
     assert resp["Content-disposition"] == "attachment; filename=%s_%s" % (
         "sha1",
         content_image_type["sha1"],
     )
     assert resp.content == content_data
 
     url = reverse(
         "browse-content-raw",
         url_args={"query_string": content_image_type["sha1"]},
         query_params={"filename": filename},
     )
 
     resp = check_http_get_response(
         client, url, status_code=200, content_type="application/octet-stream"
     )
 
     assert resp["Content-Type"] == "application/octet-stream"
     assert resp["Content-disposition"] == "attachment; filename=%s" % filename
     assert resp.content == content_data
 
 
 @pytest.mark.django_db
 @pytest.mark.parametrize("staff_user_logged_in", [False, True])
 def test_content_request_errors(
     client, staff_user, invalid_sha1, unknown_content, staff_user_logged_in
 ):
 
     if staff_user_logged_in:
         client.force_login(staff_user)
 
     url = reverse("browse-content", url_args={"query_string": invalid_sha1})
     check_html_get_response(client, url, status_code=400, template_used="error.html")
 
     url = reverse("browse-content", url_args={"query_string": unknown_content["sha1"]})
     check_html_get_response(
-        client, url, status_code=404, template_used="browse/content.html"
+        client, url, status_code=404, template_used="browse-content.html"
     )
 
 
 def test_content_bytes_missing(client, archive_data, mocker, content):
     mock_archive = mocker.patch("swh.web.browse.utils.archive")
     content_data = archive_data.content_get(content["sha1"])
 
     mock_archive.lookup_content.return_value = content_data
     mock_archive.lookup_content_filetype.side_effect = Exception()
     mock_archive.lookup_content_raw.side_effect = NotFoundExc(
         "Content bytes not available!"
     )
 
     url = reverse("browse-content", url_args={"query_string": content["sha1"]})
 
     check_html_get_response(
-        client, url, status_code=404, template_used="browse/content.html"
+        client, url, status_code=404, template_used="browse-content.html"
     )
 
 
 def test_content_too_large(client, mocker):
     mock_request_content = mocker.patch("swh.web.browse.views.content.request_content")
     stub_content_too_large_data = {
         "checksums": {
             "sha1": "8624bcdae55baeef00cd11d5dfcfa60f68710a02",
             "sha1_git": "94a9ed024d3859793618152ea559a168bbcbb5e2",
             "sha256": (
                 "8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b16" "5a1dcd80c7c545eb65b903"
             ),
             "blake2s256": (
                 "38702b7168c7785bfe748b51b45d9856070ba90" "f9dc6d90f2ea75d4356411ffe"
             ),
         },
         "length": 30000000,
         "raw_data": None,
         "mimetype": "text/plain",
         "encoding": "us-ascii",
         "language": "not detected",
         "licenses": "GPL",
         "error_code": 200,
         "error_message": "",
         "error_description": "",
     }
 
     content_sha1 = stub_content_too_large_data["checksums"]["sha1"]
 
     mock_request_content.return_value = stub_content_too_large_data
 
     url = reverse("browse-content", url_args={"query_string": content_sha1})
 
     url_raw = reverse("browse-content-raw", url_args={"query_string": content_sha1})
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     assert_contains(resp, "Content is too large to be displayed")
     assert_contains(resp, url_raw)
 
 
 def test_content_uppercase(client, content):
     url = reverse(
         "browse-content-uppercase-checksum",
         url_args={"query_string": content["sha1"].upper()},
     )
 
     resp = check_html_get_response(client, url, status_code=302)
 
     redirect_url = reverse("browse-content", url_args={"query_string": content["sha1"]})
 
     assert resp["location"] == redirect_url
 
 
 def test_content_utf8_detected_as_binary_display(
     client, archive_data, content_utf8_detected_as_binary
 ):
     url = reverse(
         "browse-content",
         url_args={"query_string": content_utf8_detected_as_binary["sha1"]},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     content_display = _process_content_for_display(
         archive_data, content_utf8_detected_as_binary
     )
 
     assert_contains(resp, escape(content_display["content_data"]))
 
 
 def test_content_origin_snapshot_branch_browse(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
     branch_info = random.choice(branches)
 
     directory = archive_data.revision_get(branch_info["revision"])["directory"]
     directory_content = archive_data.directory_ls(directory)
     directory_file = random.choice(
         [e for e in directory_content if e["type"] == "file"]
     )
 
     url = reverse(
         "browse-content",
         url_args={"query_string": directory_file["checksums"]["sha1"]},
         query_params={
             "origin_url": origin_with_multiple_visits["url"],
             "snapshot": snapshot["id"],
             "branch": branch_info["name"],
             "path": directory_file["name"],
         },
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     _check_origin_snapshot_related_html(
         resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_file["name"])
     assert_contains(resp, f"Branch: <strong>{branch_info['name']}</strong>")
 
     cnt_swhid = gen_swhid(
         ObjectType.CONTENT,
         directory_file["checksums"]["sha1_git"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.REVISION, branch_info["revision"]),
             "path": f"/{directory_file['name']}",
         },
     )
     assert_contains(resp, cnt_swhid)
 
     dir_swhid = gen_swhid(
         ObjectType.DIRECTORY,
         directory,
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.REVISION, branch_info["revision"]),
         },
     )
     assert_contains(resp, dir_swhid)
 
     rev_swhid = gen_swhid(
         ObjectType.REVISION,
         branch_info["revision"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rev_swhid)
 
     snp_swhid = gen_swhid(
         ObjectType.SNAPSHOT,
         snapshot["id"],
         metadata={
             "origin": origin_url,
         },
     )
     assert_contains(resp, snp_swhid)
 
 
 def test_content_origin_snapshot_release_browse(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
     release_info = random.choice(releases)
 
     directory_content = archive_data.directory_ls(release_info["directory"])
     directory_file = random.choice(
         [e for e in directory_content if e["type"] == "file"]
     )
 
     url = reverse(
         "browse-content",
         url_args={"query_string": directory_file["checksums"]["sha1"]},
         query_params={
             "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "release": release_info["name"],
             "path": directory_file["name"],
         },
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     _check_origin_snapshot_related_html(
         resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_file["name"])
     assert_contains(resp, f"Release: <strong>{release_info['name']}</strong>")
 
     cnt_swhid = gen_swhid(
         ObjectType.CONTENT,
         directory_file["checksums"]["sha1_git"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.RELEASE, release_info["id"]),
             "path": f"/{directory_file['name']}",
         },
     )
     assert_contains(resp, cnt_swhid)
 
     dir_swhid = gen_swhid(
         ObjectType.DIRECTORY,
         release_info["directory"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.RELEASE, release_info["id"]),
         },
     )
     assert_contains(resp, dir_swhid)
 
     rev_swhid = gen_swhid(
         ObjectType.REVISION,
         release_info["target"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rev_swhid)
 
     rel_swhid = gen_swhid(
         ObjectType.RELEASE,
         release_info["id"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rel_swhid)
 
     snp_swhid = gen_swhid(
         ObjectType.SNAPSHOT,
         snapshot["id"],
         metadata={
             "origin": origin_url,
         },
     )
     assert_contains(resp, snp_swhid)
 
 
 def _check_origin_snapshot_related_html(
     resp, origin, snapshot, snapshot_sizes, branches, releases
 ):
     browse_origin_url = reverse(
         "browse-origin", query_params={"origin_url": origin["url"]}
     )
     assert_contains(resp, f'href="{browse_origin_url}"')
 
     origin_branches_url = reverse(
         "browse-origin-branches",
         query_params={"origin_url": origin["url"], "snapshot": snapshot["id"]},
     )
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse(
         "browse-origin-releases",
         query_params={"origin_url": origin["url"], "snapshot": snapshot["id"]},
     )
 
     assert_contains(resp, f'href="{escape(origin_releases_url)}"')
     assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
 
     assert_contains(resp, '<li class="swh-branch">', count=len(branches))
     assert_contains(resp, '<li class="swh-release">', count=len(releases))
 
 
 def _process_content_for_display(archive_data, content):
     content_data = archive_data.content_get_data(content["sha1"])
 
     mime_type, encoding = get_mimetype_and_encoding_for_content(content_data["data"])
 
     mime_type, encoding, content_data = re_encode_content(
         mime_type, encoding, content_data["data"]
     )
 
     content_display = prepare_content_for_display(
         content_data, mime_type, content["path"]
     )
 
     assert type(content_display["content_data"]) == str
 
     return content_display
 
 
 def test_content_dispaly_empty_query_string_missing_path(client):
     url = reverse(
         "browse-content",
         query_params={"origin_url": "http://example.com"},
     )
     resp = check_html_get_response(
         client, url, status_code=400, template_used="error.html"
     )
     assert_contains(resp, "The path query parameter must be provided.", status_code=400)
 
 
 def test_content_dispaly_empty_query_string_and_snapshot_origin(client):
     url = reverse(
         "browse-content",
         query_params={"path": "test.txt"},
     )
     resp = check_html_get_response(
         client,
         url,
         status_code=400,
     )
     assert_contains(
         resp,
         "The origin_url or snapshot query parameters must be provided.",
         status_code=400,
     )
 
 
 def test_content_dispaly_empty_query_string_with_origin(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     snapshot = archive_data.snapshot_get_latest(origin_url)
     head_rev_id = archive_data.snapshot_get_head(snapshot)
     head_rev = archive_data.revision_get(head_rev_id)
     dir_content = archive_data.directory_ls(head_rev["directory"])
     dir_files = [e for e in dir_content if e["type"] == "file"]
     dir_file = random.choice(dir_files)
 
     url = reverse(
         "browse-content",
         query_params={
             "origin_url": origin_url,
             "path": dir_file["name"],
         },
     )
 
     resp = check_html_get_response(
         client,
         url,
         status_code=302,
     )
     redict_url = reverse(
         "browse-content",
         url_args={"query_string": f"sha1_git:{dir_file['checksums']['sha1_git']}"},
         query_params={
             "origin_url": origin_url,
             "path": dir_file["name"],
         },
     )
     assert resp.url == redict_url
 
 
 def test_content_dispaly_empty_query_string_with_snapshot(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     snapshot = archive_data.snapshot_get_latest(origin_url)
     head_rev_id = archive_data.snapshot_get_head(snapshot)
     head_rev = archive_data.revision_get(head_rev_id)
     dir_content = archive_data.directory_ls(head_rev["directory"])
     dir_files = [e for e in dir_content if e["type"] == "file"]
     dir_file = random.choice(dir_files)
     url = reverse(
         "browse-content",
         query_params={
             "snapshot": snapshot["id"],
             "path": dir_file["name"],
         },
     )
 
     resp = check_html_get_response(
         client,
         url,
         status_code=302,
     )
     redict_url = reverse(
         "browse-content",
         url_args={"query_string": f"sha1_git:{dir_file['checksums']['sha1_git']}"},
         query_params={
             "snapshot": snapshot["id"],
             "path": dir_file["name"],
         },
     )
     assert resp.url == redict_url
 
 
 def test_browse_origin_content_no_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.utils.origin_visits.get_origin_visits"
     )
     mock_get_origin_visits.return_value = []
     mock_archive = mocker.patch("swh.web.utils.origin_visits.archive")
     mock_archive.lookup_origin_visit_latest.return_value = None
     url = reverse(
         "browse-content",
         query_params={"origin_url": origin["url"], "path": "foo"},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(resp, "No valid visit", status_code=404)
     assert not mock_get_origin_visits.called
 
 
 def test_browse_origin_content_unknown_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.utils.origin_visits.get_origin_visits"
     )
     mock_get_origin_visits.return_value = [{"visit": 1}]
 
     url = reverse(
         "browse-content",
         query_params={"origin_url": origin["url"], "path": "foo", "visit_id": 2},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert re.search("Resource not found", resp.content.decode("utf-8"))
 
 
 def test_browse_origin_content_not_found(client, origin):
     url = reverse(
         "browse-content",
         query_params={"origin_url": origin["url"], "path": "/invalid/file/path"},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert re.search("Resource not found", resp.content.decode("utf-8"))
 
 
 def test_browse_content_invalid_origin(client):
     url = reverse(
         "browse-content",
         query_params={
             "origin_url": "http://invalid-origin",
             "path": "/invalid/file/path",
         },
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert re.search("Resource not found", resp.content.decode("utf-8"))
 
 
 def test_origin_content_view(
     client, archive_data, swh_scheduler, origin_with_multiple_visits
 ):
     origin_visits = archive_data.origin_visit_get(origin_with_multiple_visits["url"])
 
     def _get_archive_data(visit_idx):
         snapshot = archive_data.snapshot_get(origin_visits[visit_idx]["snapshot"])
         head_rev_id = archive_data.snapshot_get_head(snapshot)
         head_rev = archive_data.revision_get(head_rev_id)
         dir_content = archive_data.directory_ls(head_rev["directory"])
         dir_files = [e for e in dir_content if e["type"] == "file"]
         dir_file = random.choice(dir_files)
         branches, releases, _ = process_snapshot_branches(snapshot)
         return {
             "branches": branches,
             "releases": releases,
             "root_dir_sha1": head_rev["directory"],
             "content": get_content(dir_file["checksums"]["sha1"]),
             "visit": origin_visits[visit_idx],
             "snapshot_sizes": archive_data.snapshot_count_branches(snapshot["id"]),
         }
 
     tdata = _get_archive_data(-1)
 
     _origin_content_view_test_helper(
         client,
         archive_data,
         origin_with_multiple_visits,
         origin_visits[-1],
         tdata["snapshot_sizes"],
         tdata["branches"],
         tdata["releases"],
         tdata["root_dir_sha1"],
         tdata["content"],
     )
 
     _origin_content_view_test_helper(
         client,
         archive_data,
         origin_with_multiple_visits,
         origin_visits[-1],
         tdata["snapshot_sizes"],
         tdata["branches"],
         tdata["releases"],
         tdata["root_dir_sha1"],
         tdata["content"],
         timestamp=tdata["visit"]["date"],
     )
 
     _origin_content_view_test_helper(
         client,
         archive_data,
         origin_with_multiple_visits,
         origin_visits[-1],
         tdata["snapshot_sizes"],
         tdata["branches"],
         tdata["releases"],
         tdata["root_dir_sha1"],
         tdata["content"],
         snapshot_id=tdata["visit"]["snapshot"],
     )
 
     tdata = _get_archive_data(0)
 
     _origin_content_view_test_helper(
         client,
         archive_data,
         origin_with_multiple_visits,
         origin_visits[0],
         tdata["snapshot_sizes"],
         tdata["branches"],
         tdata["releases"],
         tdata["root_dir_sha1"],
         tdata["content"],
         visit_id=tdata["visit"]["visit"],
     )
 
     _origin_content_view_test_helper(
         client,
         archive_data,
         origin_with_multiple_visits,
         origin_visits[0],
         tdata["snapshot_sizes"],
         tdata["branches"],
         tdata["releases"],
         tdata["root_dir_sha1"],
         tdata["content"],
         snapshot_id=tdata["visit"]["snapshot"],
     )
 
 
 def _origin_content_view_test_helper(
     client,
     archive_data,
     origin_info,
     origin_visit,
     snapshot_sizes,
     origin_branches,
     origin_releases,
     root_dir_sha1,
     content,
     visit_id=None,
     timestamp=None,
     snapshot_id=None,
 ):
     content_path = "/".join(content["path"].split("/")[1:])
 
     if not visit_id and not snapshot_id:
         visit_id = origin_visit["visit"]
 
     query_params = {"origin_url": origin_info["url"], "path": content_path}
 
     if timestamp:
         query_params["timestamp"] = timestamp
 
     if visit_id:
         query_params["visit_id"] = visit_id
     elif snapshot_id:
         query_params["snapshot"] = snapshot_id
 
     url = reverse(
         "browse-content",
         url_args={"query_string": f"sha1_git:{content['sha1_git']}"},
         query_params=query_params,
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     assert type(content["data"]) == str
 
     assert_contains(resp, '<code class="%s">' % content["hljs_language"])
     assert_contains(resp, escape(content["data"]))
 
     split_path = content_path.split("/")
 
     filename = split_path[-1]
     path = content_path.replace(filename, "")[:-1]
 
     path_info = gen_path_info(path)
 
     del query_params["path"]
 
     if timestamp:
         query_params["timestamp"] = format_utc_iso_date(
             parse_iso8601_date_to_utc(timestamp).isoformat(), "%Y-%m-%dT%H:%M:%SZ"
         )
 
     root_dir_url = reverse(
         "browse-directory",
         url_args={"sha1_git": root_dir_sha1},
         query_params=query_params,
     )
 
     assert_contains(resp, '<li class="swh-path">', count=len(path_info) + 1)
 
     assert_contains(resp, '<a href="%s">%s</a>' % (root_dir_url, root_dir_sha1[:7]))
 
     for p in path_info:
         query_params["path"] = p["path"]
         dir_url = reverse("browse-origin-directory", query_params=query_params)
         assert_contains(resp, '<a href="%s">%s</a>' % (dir_url, p["name"]))
 
     assert_contains(resp, "<li>%s</li>" % filename)
 
     query_string = "sha1_git:" + content["sha1_git"]
 
     url_raw = reverse(
         "browse-content-raw",
         url_args={"query_string": query_string},
         query_params={"filename": filename},
     )
     assert_contains(resp, url_raw)
 
     if "path" in query_params:
         del query_params["path"]
 
     origin_branches_url = reverse("browse-origin-branches", query_params=query_params)
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse("browse-origin-releases", query_params=query_params)
 
     assert_contains(resp, f'href="{escape(origin_releases_url)}">')
     assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
 
     assert_contains(resp, '<li class="swh-branch">', count=len(origin_branches))
 
     query_params["path"] = content_path
 
     for branch in origin_branches:
         root_dir_branch_url = reverse(
             "browse-origin-content",
             query_params={"branch": branch["name"], **query_params},
         )
 
         assert_contains(resp, '<a href="%s">' % root_dir_branch_url)
 
     assert_contains(resp, '<li class="swh-release">', count=len(origin_releases))
 
     query_params["branch"] = None
     for release in origin_releases:
         root_dir_release_url = reverse(
             "browse-origin-content",
             query_params={"release": release["name"], **query_params},
         )
 
         assert_contains(resp, '<a href="%s">' % root_dir_release_url)
 
     url = reverse(
         "browse-content",
         url_args={"query_string": query_string},
         query_params=query_params,
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/content.html"
+        client, url, status_code=200, template_used="browse-content.html"
     )
 
     snapshot = archive_data.snapshot_get(origin_visit["snapshot"])
     head_rev_id = archive_data.snapshot_get_head(snapshot)
 
     swhid_context = {
         "origin": origin_info["url"],
         "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         "anchor": gen_swhid(ObjectType.REVISION, head_rev_id),
         "path": f"/{content_path}",
     }
 
     swh_cnt_id = gen_swhid(
         ObjectType.CONTENT, content["sha1_git"], metadata=swhid_context
     )
     swh_cnt_id_url = reverse("browse-swhid", url_args={"swhid": swh_cnt_id})
     assert_contains(resp, swh_cnt_id)
     assert_contains(resp, swh_cnt_id_url)
 
     assert_contains(resp, "swh-take-new-snapshot")
 
     _check_origin_link(resp, origin_info["url"])
 
     assert_not_contains(resp, "swh-metadata-popover")
 
 
 def _check_origin_link(resp, origin_url):
     browse_origin_url = reverse(
         "browse-origin", query_params={"origin_url": origin_url}
     )
     assert_contains(resp, f'href="{browse_origin_url}"')
 
 
 @pytest.mark.django_db
 @pytest.mark.parametrize("staff_user_logged_in", [False, True])
 def test_browse_content_snapshot_context_release_directory_target(
     client, staff_user, archive_data, directory_with_files, staff_user_logged_in
 ):
 
     if staff_user_logged_in:
         client.force_login(staff_user)
 
     release_name = "v1.0.0"
     release = Release(
         name=release_name.encode(),
         message=f"release {release_name}".encode(),
         target=hash_to_bytes(directory_with_files),
         target_type=ModelObjectType.DIRECTORY,
         synthetic=True,
     )
     archive_data.release_add([release])
 
     snapshot = Snapshot(
         branches={
             release_name.encode(): SnapshotBranch(
                 target=release.id, target_type=TargetType.RELEASE
             ),
         },
     )
     archive_data.snapshot_add([snapshot])
 
     dir_content = archive_data.directory_ls(directory_with_files)
     file_entry = random.choice(
         [entry for entry in dir_content if entry["type"] == "file"]
     )
 
     sha1_git = file_entry["checksums"]["sha1_git"]
 
     browse_url = reverse(
         "browse-content",
         url_args={"query_string": f"sha1_git:{sha1_git}"},
         query_params={
             "path": file_entry["name"],
             "release": release_name,
             "snapshot": snapshot.id.hex(),
         },
     )
 
     check_html_get_response(
-        client, browse_url, status_code=200, template_used="browse/content.html"
+        client, browse_url, status_code=200, template_used="browse-content.html"
     )
diff --git a/swh/web/tests/browse/views/test_directory.py b/swh/web/tests/browse/views/test_directory.py
index 26049d93..a0f1272e 100644
--- a/swh/web/tests/browse/views/test_directory.py
+++ b/swh/web/tests/browse/views/test_directory.py
@@ -1,565 +1,565 @@
-# Copyright (C) 2017-2021  The Software Heritage developers
+# Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 
 from hypothesis import given
 import pytest
 
 from django.utils.html import escape
 
 from swh.model.from_disk import DentryPerms
 from swh.model.hashutil import hash_to_bytes, hash_to_hex
 from swh.model.model import (
     Origin,
     OriginVisit,
     OriginVisitStatus,
     Release,
     Revision,
     RevisionType,
     Snapshot,
     SnapshotBranch,
     TargetType,
     TimestampWithTimezone,
 )
 from swh.model.model import Directory, DirectoryEntry
 from swh.model.model import ObjectType as ModelObjectType
 from swh.model.swhids import ObjectType
 from swh.storage.utils import now
 from swh.web.browse.snapshot_context import process_snapshot_branches
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
 from swh.web.tests.helpers import check_html_get_response
 from swh.web.tests.strategies import new_person, new_swh_date
 from swh.web.utils import gen_path_info, reverse
 from swh.web.utils.identifiers import gen_swhid
 
 
 def test_root_directory_view(client, archive_data, directory):
     _directory_view_checks(client, directory, archive_data.directory_ls(directory))
 
 
 def test_sub_directory_view(client, archive_data, directory_with_subdirs):
     dir_content = archive_data.directory_ls(directory_with_subdirs)
     subdir = random.choice([e for e in dir_content if e["type"] == "dir"])
     subdir_content = archive_data.directory_ls(subdir["target"])
     _directory_view_checks(
         client, directory_with_subdirs, subdir_content, subdir["name"]
     )
 
 
 @given(new_person(), new_swh_date())
 def test_sub_directory_view_origin_context(
     client, archive_data, empty_directory, person, date
 ):
     origin_url = "test_sub_directory_view_origin_context"
     subdir = Directory(
         entries=(
             DirectoryEntry(
                 name=b"foo",
                 type="dir",
                 target=hash_to_bytes(empty_directory),
                 perms=DentryPerms.directory,
             ),
             DirectoryEntry(
                 name=b"bar",
                 type="dir",
                 target=hash_to_bytes(empty_directory),
                 perms=DentryPerms.directory,
             ),
         )
     )
 
     parentdir = Directory(
         entries=(
             DirectoryEntry(
                 name=b"baz",
                 type="dir",
                 target=subdir.id,
                 perms=DentryPerms.directory,
             ),
         )
     )
     archive_data.directory_add([subdir, parentdir])
 
     revision = Revision(
         directory=parentdir.id,
         author=person,
         committer=person,
         message=b"commit message",
         date=TimestampWithTimezone.from_datetime(date),
         committer_date=TimestampWithTimezone.from_datetime(date),
         synthetic=False,
         type=RevisionType.GIT,
     )
     archive_data.revision_add([revision])
 
     snapshot = Snapshot(
         branches={
             b"HEAD": SnapshotBranch(
                 target="refs/head/master".encode(),
                 target_type=TargetType.ALIAS,
             ),
             b"refs/head/master": SnapshotBranch(
                 target=revision.id,
                 target_type=TargetType.REVISION,
             ),
         }
     )
     archive_data.snapshot_add([snapshot])
 
     archive_data.origin_add([Origin(url=origin_url)])
     date = now()
     visit = OriginVisit(origin=origin_url, date=date, type="git")
     visit = archive_data.origin_visit_add([visit])[0]
     visit_status = OriginVisitStatus(
         origin=origin_url,
         visit=visit.visit,
         date=date,
         status="full",
         snapshot=snapshot.id,
     )
     archive_data.origin_visit_status_add([visit_status])
 
     dir_content = archive_data.directory_ls(hash_to_hex(parentdir.id))
     subdir = dir_content[0]
     subdir_content = archive_data.directory_ls(subdir["target"])
     _directory_view_checks(
         client,
         hash_to_hex(parentdir.id),
         subdir_content,
         subdir["name"],
         origin_url,
         hash_to_hex(snapshot.id),
         hash_to_hex(revision.id),
     )
 
 
 def test_directory_request_errors(client, invalid_sha1, unknown_directory):
     dir_url = reverse("browse-directory", url_args={"sha1_git": invalid_sha1})
 
     check_html_get_response(
         client, dir_url, status_code=400, template_used="error.html"
     )
 
     dir_url = reverse("browse-directory", url_args={"sha1_git": unknown_directory})
 
     check_html_get_response(
         client, dir_url, status_code=404, template_used="error.html"
     )
 
 
 def test_directory_with_invalid_path(client, directory):
     path = "foo/bar"
     dir_url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={"path": path},
     )
 
     resp = check_html_get_response(
-        client, dir_url, status_code=404, template_used="browse/directory.html"
+        client, dir_url, status_code=404, template_used="browse-directory.html"
     )
     error_message = (
         f"Directory entry with path {path} from root directory {directory} not found"
     )
     assert_contains(resp, error_message, status_code=404)
 
 
 def test_directory_uppercase(client, directory):
     url = reverse(
         "browse-directory-uppercase-checksum", url_args={"sha1_git": directory.upper()}
     )
 
     resp = check_html_get_response(client, url, status_code=302)
 
     redirect_url = reverse("browse-directory", url_args={"sha1_git": directory})
 
     assert resp["location"] == redirect_url
 
 
 def test_permalink_box_context(client, tests_data, directory):
     origin_url = random.choice(tests_data["origins"])["url"]
     url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={"origin_url": origin_url},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
     assert_contains(resp, 'id="swhid-context-option-directory"')
 
 
 def test_directory_origin_snapshot_branch_browse(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
     branch_info = next(
         branch for branch in branches if branch["name"] == "refs/heads/master"
     )
 
     directory = archive_data.revision_get(branch_info["revision"])["directory"]
     directory_content = archive_data.directory_ls(directory)
     directory_subdir = random.choice(
         [e for e in directory_content if e["type"] == "dir"]
     )
 
     url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={
             "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "branch": branch_info["name"],
             "path": directory_subdir["name"],
         },
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
 
     _check_origin_snapshot_related_html(
         resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_subdir["name"])
     assert_contains(resp, f"Branch: <strong>{branch_info['name']}</strong>")
 
     dir_swhid = gen_swhid(
         ObjectType.DIRECTORY,
         directory_subdir["target"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.REVISION, branch_info["revision"]),
             "path": "/",
         },
     )
     assert_contains(resp, dir_swhid)
 
     rev_swhid = gen_swhid(
         ObjectType.REVISION,
         branch_info["revision"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rev_swhid)
 
     snp_swhid = gen_swhid(
         ObjectType.SNAPSHOT,
         snapshot["id"],
         metadata={
             "origin": origin_url,
         },
     )
     assert_contains(resp, snp_swhid)
 
 
 def test_drectory_origin_snapshot_release_browse(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
     release_info = random.choice(releases)
 
     directory = release_info["directory"]
     directory_content = archive_data.directory_ls(directory)
     directory_subdir = random.choice(
         [e for e in directory_content if e["type"] == "dir"]
     )
 
     url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={
             "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "release": release_info["name"],
             "path": directory_subdir["name"],
         },
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
 
     _check_origin_snapshot_related_html(
         resp, origin_with_multiple_visits, snapshot, snapshot_sizes, branches, releases
     )
     assert_contains(resp, directory_subdir["name"])
     assert_contains(resp, f"Release: <strong>{release_info['name']}</strong>")
 
     dir_swhid = gen_swhid(
         ObjectType.DIRECTORY,
         directory_subdir["target"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.RELEASE, release_info["id"]),
             "path": "/",
         },
     )
     assert_contains(resp, dir_swhid)
 
     rev_swhid = gen_swhid(
         ObjectType.REVISION,
         release_info["target"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rev_swhid)
 
     rel_swhid = gen_swhid(
         ObjectType.RELEASE,
         release_info["id"],
         metadata={
             "origin": origin_url,
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         },
     )
     assert_contains(resp, rel_swhid)
 
     snp_swhid = gen_swhid(
         ObjectType.SNAPSHOT,
         snapshot["id"],
         metadata={
             "origin": origin_url,
         },
     )
     assert_contains(resp, snp_swhid)
 
 
 def test_directory_origin_snapshot_revision_browse(
     client, archive_data, origin_with_multiple_visits
 ):
     origin_url = origin_with_multiple_visits["url"]
     visits = archive_data.origin_visit_get(origin_url)
     visit = random.choice(visits)
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     branches, releases, _ = process_snapshot_branches(snapshot)
     branch_info = next(
         branch for branch in branches if branch["name"] == "refs/heads/master"
     )
 
     directory = archive_data.revision_get(branch_info["revision"])["directory"]
     directory_content = archive_data.directory_ls(directory)
     directory_subdir = random.choice(
         [e for e in directory_content if e["type"] == "dir"]
     )
 
     url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory},
         query_params={
             "origin_url": origin_url,
             "snapshot": snapshot["id"],
             "revision": branch_info["revision"],
             "path": directory_subdir["name"],
         },
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
 
     assert_contains(resp, f"Revision: <strong>{branch_info['revision']}</strong>")
 
 
 def _check_origin_snapshot_related_html(
     resp, origin, snapshot, snapshot_sizes, branches, releases
 ):
     browse_origin_url = reverse(
         "browse-origin", query_params={"origin_url": origin["url"]}
     )
 
     assert_contains(resp, f'href="{browse_origin_url}"')
 
     origin_branches_url = reverse(
         "browse-origin-branches",
         query_params={"origin_url": origin["url"], "snapshot": snapshot["id"]},
     )
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse(
         "browse-origin-releases",
         query_params={"origin_url": origin["url"], "snapshot": snapshot["id"]},
     )
 
     assert_contains(resp, f'href="{escape(origin_releases_url)}"')
     assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
 
     assert_contains(resp, '<li class="swh-branch">', count=len(branches))
     assert_contains(resp, '<li class="swh-release">', count=len(releases))
 
 
 def _directory_view_checks(
     client,
     root_directory_sha1,
     directory_entries,
     path=None,
     origin_url=None,
     snapshot_id=None,
     revision_id=None,
 ):
     dirs = [e for e in directory_entries if e["type"] in ("dir", "rev")]
     files = [e for e in directory_entries if e["type"] == "file"]
 
     url_args = {"sha1_git": root_directory_sha1}
     query_params = {"origin_url": origin_url, "snapshot": snapshot_id}
 
     url = reverse(
         "browse-directory",
         url_args=url_args,
         query_params={**query_params, "path": path},
     )
 
     root_dir_url = reverse(
         "browse-directory",
         url_args=url_args,
         query_params=query_params,
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
 
     assert_contains(
         resp,
         '<a href="' + root_dir_url + '">' + root_directory_sha1[:7] + "</a>",
     )
     assert_contains(resp, '<td class="swh-directory">', count=len(dirs))
     assert_contains(resp, '<td class="swh-content">', count=len(files))
 
     for d in dirs:
         if d["type"] == "rev":
             dir_url = reverse("browse-revision", url_args={"sha1_git": d["target"]})
         else:
             dir_path = d["name"]
             if path:
                 dir_path = "%s/%s" % (path, d["name"])
             dir_url = reverse(
                 "browse-directory",
                 url_args={"sha1_git": root_directory_sha1},
                 query_params={**query_params, "path": dir_path},
             )
         assert_contains(resp, dir_url)
 
     for f in files:
         file_path = "%s/%s" % (root_directory_sha1, f["name"])
         if path:
             file_path = "%s/%s/%s" % (root_directory_sha1, path, f["name"])
         query_string = "sha1_git:" + f["target"]
         file_url = reverse(
             "browse-content",
             url_args={"query_string": query_string},
             query_params={**query_params, "path": file_path},
         )
         assert_contains(resp, file_url)
 
     path_info = gen_path_info(path)
 
     assert_contains(resp, '<li class="swh-path">', count=len(path_info) + 1)
     assert_contains(
         resp, '<a href="%s">%s</a>' % (root_dir_url, root_directory_sha1[:7])
     )
 
     for p in path_info:
         dir_url = reverse(
             "browse-directory",
             url_args={"sha1_git": root_directory_sha1},
             query_params={**query_params, "path": p["path"]},
         )
         assert_contains(resp, '<a href="%s">%s</a>' % (dir_url, p["name"]))
 
     assert_contains(resp, "vault-cook-directory")
 
     swh_dir_id = gen_swhid(ObjectType.DIRECTORY, directory_entries[0]["dir_id"])
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
 
     swhid_context = {}
     if origin_url:
         swhid_context["origin"] = origin_url
     if snapshot_id:
         swhid_context["visit"] = gen_swhid(ObjectType.SNAPSHOT, snapshot_id)
     if root_directory_sha1 != directory_entries[0]["dir_id"]:
         swhid_context["anchor"] = gen_swhid(ObjectType.DIRECTORY, root_directory_sha1)
     if root_directory_sha1 != directory_entries[0]["dir_id"]:
         swhid_context["anchor"] = gen_swhid(ObjectType.DIRECTORY, root_directory_sha1)
     if revision_id:
         swhid_context["anchor"] = gen_swhid(ObjectType.REVISION, revision_id)
     swhid_context["path"] = f"/{path}/" if path else None
 
     swh_dir_id = gen_swhid(
         ObjectType.DIRECTORY, directory_entries[0]["dir_id"], metadata=swhid_context
     )
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
 
     assert_not_contains(resp, "swh-metadata-popover")
 
 
 @pytest.mark.django_db
 @pytest.mark.parametrize("staff_user_logged_in", [False, True])
 def test_browse_directory_snapshot_context_release_directory_target(
     client, staff_user, archive_data, directory_with_subdirs, staff_user_logged_in
 ):
 
     if staff_user_logged_in:
         client.force_login(staff_user)
 
     release_name = "v1.0.0"
     release = Release(
         name=release_name.encode(),
         message=f"release {release_name}".encode(),
         target=hash_to_bytes(directory_with_subdirs),
         target_type=ModelObjectType.DIRECTORY,
         synthetic=True,
     )
     archive_data.release_add([release])
 
     snapshot = Snapshot(
         branches={
             release_name.encode(): SnapshotBranch(
                 target=release.id, target_type=TargetType.RELEASE
             ),
         },
     )
     archive_data.snapshot_add([snapshot])
 
     dir_content = archive_data.directory_ls(directory_with_subdirs)
     dir_entry = random.choice(
         [entry for entry in dir_content if entry["type"] == "dir"]
     )
 
     browse_url = reverse(
         "browse-directory",
         url_args={"sha1_git": directory_with_subdirs},
         query_params={
             "path": dir_entry["name"],
             "release": release_name,
             "snapshot": snapshot.id.hex(),
         },
     )
 
     check_html_get_response(
-        client, browse_url, status_code=200, template_used="browse/directory.html"
+        client, browse_url, status_code=200, template_used="browse-directory.html"
     )
diff --git a/swh/web/tests/browse/views/test_identifiers.py b/swh/web/tests/browse/views/test_identifiers.py
index 77fbf8be..12d29922 100644
--- a/swh/web/tests/browse/views/test_identifiers.py
+++ b/swh/web/tests/browse/views/test_identifiers.py
@@ -1,223 +1,223 @@
-# Copyright (C) 2018-2021  The Software Heritage developers
+# Copyright (C) 2018-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 from urllib.parse import quote
 
 from swh.model.model import Origin
 from swh.model.swhids import ObjectType
 from swh.web.tests.django_asserts import assert_contains
 from swh.web.tests.helpers import check_html_get_response
 from swh.web.utils import reverse
 from swh.web.utils.identifiers import gen_swhid
 
 
 def test_content_id_browse(client, content):
     cnt_sha1_git = content["sha1_git"]
     swhid = gen_swhid(ObjectType.CONTENT, cnt_sha1_git)
 
     for swhid_ in (swhid, swhid.upper()):
         url = reverse("browse-swhid", url_args={"swhid": swhid_})
 
         query_string = "sha1_git:" + cnt_sha1_git
         content_browse_url = reverse(
             "browse-content", url_args={"query_string": query_string}
         )
 
         resp = check_html_get_response(client, url, status_code=302)
         assert resp["location"] == content_browse_url
 
 
 def test_directory_id_browse(client, directory):
     swhid = gen_swhid(ObjectType.DIRECTORY, directory)
 
     for swhid_ in (swhid, swhid.upper()):
         url = reverse("browse-swhid", url_args={"swhid": swhid_})
 
         directory_browse_url = reverse(
             "browse-directory", url_args={"sha1_git": directory}
         )
 
         resp = check_html_get_response(client, url, status_code=302)
         assert resp["location"] == directory_browse_url
 
 
 def test_revision_id_browse(client, revision):
     swhid = gen_swhid(ObjectType.REVISION, revision)
 
     for swhid_ in (swhid, swhid.upper()):
         url = reverse("browse-swhid", url_args={"swhid": swhid_})
 
         revision_browse_url = reverse(
             "browse-revision", url_args={"sha1_git": revision}
         )
 
         resp = check_html_get_response(client, url, status_code=302)
         assert resp["location"] == revision_browse_url
 
         query_params = {"origin_url": "https://github.com/user/repo"}
         url = reverse(
             "browse-swhid", url_args={"swhid": swhid_}, query_params=query_params
         )
 
         revision_browse_url = reverse(
             "browse-revision",
             url_args={"sha1_git": revision},
             query_params=query_params,
         )
 
         resp = check_html_get_response(client, url, status_code=302)
         assert resp["location"] == revision_browse_url
 
 
 def test_release_id_browse(client, release):
     swhid = gen_swhid(ObjectType.RELEASE, release)
 
     for swhid_ in (swhid, swhid.upper()):
         url = reverse("browse-swhid", url_args={"swhid": swhid_})
 
         release_browse_url = reverse("browse-release", url_args={"sha1_git": release})
 
         resp = check_html_get_response(client, url, status_code=302)
         assert resp["location"] == release_browse_url
 
         query_params = {"origin_url": "https://github.com/user/repo"}
 
         url = reverse(
             "browse-swhid", url_args={"swhid": swhid_}, query_params=query_params
         )
 
         release_browse_url = reverse(
             "browse-release", url_args={"sha1_git": release}, query_params=query_params
         )
 
         resp = check_html_get_response(client, url, status_code=302)
         assert resp["location"] == release_browse_url
 
 
 def test_snapshot_id_browse(client, snapshot):
     swhid = gen_swhid(ObjectType.SNAPSHOT, snapshot)
 
     for swhid_ in (swhid, swhid.upper()):
         url = reverse("browse-swhid", url_args={"swhid": swhid_})
 
         snapshot_browse_url = reverse(
             "browse-snapshot", url_args={"snapshot_id": snapshot}
         )
 
         resp = check_html_get_response(client, url, status_code=302)
         assert resp["location"] == snapshot_browse_url
 
         query_params = {"origin_url": "https://github.com/user/repo"}
 
         url = reverse(
             "browse-swhid", url_args={"swhid": swhid_}, query_params=query_params
         )
 
         release_browse_url = reverse(
             "browse-snapshot",
             url_args={"snapshot_id": snapshot},
             query_params=query_params,
         )
 
         resp = check_html_get_response(client, url, status_code=302)
         assert resp["location"] == release_browse_url
 
 
 def test_bad_id_browse(client, release):
     swhid = f"swh:1:foo:{release}"
     url = reverse("browse-swhid", url_args={"swhid": swhid})
 
     check_html_get_response(client, url, status_code=400)
 
 
 def test_content_id_optional_parts_browse(client, archive_data, content):
     cnt_sha1_git = content["sha1_git"]
     origin_url = "https://github.com/user/repo"
 
     archive_data.origin_add([Origin(url=origin_url)])
 
     swhid = gen_swhid(
         ObjectType.CONTENT,
         cnt_sha1_git,
         metadata={"lines": "4-20", "origin": origin_url},
     )
     url = reverse("browse-swhid", url_args={"swhid": swhid})
 
     query_string = "sha1_git:" + cnt_sha1_git
     content_browse_url = reverse(
         "browse-content",
         url_args={"query_string": query_string},
         query_params={"origin_url": origin_url},
     )
     content_browse_url += "#L4-L20"
 
     resp = check_html_get_response(client, url, status_code=302)
     assert resp["location"] == content_browse_url
 
 
 def test_origin_id_not_resolvable(client, release):
     swhid = "swh:1:ori:8068d0075010b590762c6cb5682ed53cb3c13deb"
     url = reverse("browse-swhid", url_args={"swhid": swhid})
 
     check_html_get_response(client, url, status_code=400)
 
 
 def test_legacy_swhid_browse(archive_data, client, origin):
     snapshot = archive_data.snapshot_get_latest(origin["url"])
     revision = archive_data.snapshot_get_head(snapshot)
     directory = archive_data.revision_get(revision)["directory"]
     directory_content = archive_data.directory_ls(directory)
     directory_file = random.choice(
         [e for e in directory_content if e["type"] == "file"]
     )
     legacy_swhid = gen_swhid(
         ObjectType.CONTENT,
         directory_file["checksums"]["sha1_git"],
         metadata={"origin": origin["url"]},
     )
 
     url = reverse("browse-swhid", url_args={"swhid": legacy_swhid})
 
     resp = check_html_get_response(client, url, status_code=302)
     resp = check_html_get_response(
-        client, resp["location"], status_code=200, template_used="browse/content.html"
+        client, resp["location"], status_code=200, template_used="browse-content.html"
     )
 
     swhid = gen_swhid(
         ObjectType.CONTENT,
         directory_file["checksums"]["sha1_git"],
         metadata={
             "origin": origin["url"],
             "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
             "anchor": gen_swhid(ObjectType.REVISION, revision),
         },
     )
 
     assert_contains(resp, swhid)
 
     # also check legacy SWHID URL with trailing slash
     url = reverse("browse-swhid-legacy", url_args={"swhid": swhid})
 
     resp = check_html_get_response(client, url, status_code=302)
     resp = check_html_get_response(
-        client, resp["location"], status_code=200, template_used="browse/content.html"
+        client, resp["location"], status_code=200, template_used="browse-content.html"
     )
 
     assert_contains(resp, swhid)
 
 
 def test_browse_swhid_special_characters_escaping(client, archive_data, directory):
     origin = "http://example.org/?project=abc;"
     archive_data.origin_add([Origin(url=origin)])
     origin_swhid_escaped = quote(origin, safe="/?:@&")
     origin_swhid_url_escaped = quote(origin, safe="/:@;")
     swhid = gen_swhid(
         ObjectType.DIRECTORY, directory, metadata={"origin": origin_swhid_escaped}
     )
     url = reverse("browse-swhid", url_args={"swhid": swhid})
 
     resp = check_html_get_response(client, url, status_code=302)
     assert origin_swhid_url_escaped in resp["location"]
diff --git a/swh/web/tests/browse/views/test_origin.py b/swh/web/tests/browse/views/test_origin.py
index 88b815b1..20577711 100644
--- a/swh/web/tests/browse/views/test_origin.py
+++ b/swh/web/tests/browse/views/test_origin.py
@@ -1,1022 +1,1022 @@
 # Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 import re
 
 from hypothesis import given
 import pytest
 
 from django.utils.html import escape
 
 from swh.model.hashutil import hash_to_bytes
 from swh.model.model import (
     OriginVisit,
     OriginVisitStatus,
     Snapshot,
     SnapshotBranch,
     TargetType,
 )
 from swh.model.swhids import ObjectType
 from swh.storage.utils import now
 from swh.web.browse.snapshot_context import process_snapshot_branches
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
 from swh.web.tests.helpers import check_html_get_response
 from swh.web.tests.strategies import new_origin, new_snapshot, visit_dates
 from swh.web.utils import format_utc_iso_date, parse_iso8601_date_to_utc, reverse
 from swh.web.utils.exc import NotFoundExc
 from swh.web.utils.identifiers import gen_swhid
 
 
 def test_origin_visits_browse(client, archive_data, origin_with_multiple_visits):
     origin_url = origin_with_multiple_visits["url"]
     url = reverse("browse-origin-visits", query_params={"origin_url": origin_url})
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/origin-visits.html"
+        client, url, status_code=200, template_used="browse-origin-visits.html"
     )
 
     visits = archive_data.origin_visit_get(origin_url)
 
     for v in visits:
         vdate = format_utc_iso_date(v["date"], "%Y-%m-%dT%H:%M:%SZ")
         browse_dir_url = reverse(
             "browse-origin-directory",
             query_params={"origin_url": origin_url, "timestamp": vdate},
         )
         assert_contains(resp, browse_dir_url)
 
     _check_origin_link(resp, origin_url)
 
 
 @pytest.mark.django_db
 def test_origin_root_directory_view(
     client, staff_user, archive_data, swh_scheduler, origin
 ):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
     visit = origin_visits[-1]
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(snapshot["id"])
     head_rev_id = archive_data.snapshot_get_head(snapshot)
     head_rev = archive_data.revision_get(head_rev_id)
     root_dir_sha1 = head_rev["directory"]
     dir_content = archive_data.directory_ls(root_dir_sha1)
     branches, releases, _ = process_snapshot_branches(snapshot)
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         root_dir_sha1,
         dir_content,
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         root_dir_sha1,
         dir_content,
         visit_id=visit["visit"],
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         root_dir_sha1,
         dir_content,
         timestamp=visit["date"],
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         root_dir_sha1,
         dir_content,
         snapshot_id=visit["snapshot"],
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         root_dir_sha1,
         dir_content,
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         root_dir_sha1,
         dir_content,
         visit_id=visit["visit"],
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         root_dir_sha1,
         dir_content,
         timestamp=visit["date"],
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         root_dir_sha1,
         dir_content,
         snapshot_id=visit["snapshot"],
     )
 
 
 @pytest.mark.django_db
 def test_origin_sub_directory_view(
     client, staff_user, archive_data, swh_scheduler, origin
 ):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
     visit = origin_visits[-1]
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(snapshot["id"])
     head_rev_id = archive_data.snapshot_get_head(snapshot)
     head_rev = archive_data.revision_get(head_rev_id)
     root_dir_sha1 = head_rev["directory"]
     subdirs = [
         e for e in archive_data.directory_ls(root_dir_sha1) if e["type"] == "dir"
     ]
     branches, releases, _ = process_snapshot_branches(snapshot)
 
     if len(subdirs) == 0:
         return
 
     subdir = random.choice(subdirs)
     subdir_content = archive_data.directory_ls(subdir["target"])
     subdir_path = subdir["name"]
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir["target"],
         subdir_content,
         path=subdir_path,
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir["target"],
         subdir_content,
         path=subdir_path,
         visit_id=visit["visit"],
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir["target"],
         subdir_content,
         path=subdir_path,
         timestamp=visit["date"],
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir["target"],
         subdir_content,
         path=subdir_path,
         snapshot_id=visit["snapshot"],
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir["target"],
         subdir_content,
         path=subdir_path,
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir["target"],
         subdir_content,
         path=subdir_path,
         visit_id=visit["visit"],
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir["target"],
         subdir_content,
         path=subdir_path,
         timestamp=visit["date"],
     )
 
     _origin_directory_view_test_helper(
         client,
         staff_user,
         archive_data,
         origin,
         visit,
         snapshot_sizes,
         branches,
         releases,
         root_dir_sha1,
         subdir["target"],
         subdir_content,
         path=subdir_path,
         snapshot_id=visit["snapshot"],
     )
 
 
 @given(
     new_origin(),
     new_snapshot(min_size=4, max_size=4),
     visit_dates(),
 )
 def test_origin_snapshot_null_branch(
     client,
     archive_data,
     revisions_list,
     new_origin,
     new_snapshot,
     visit_dates,
 ):
     revisions = revisions_list(size=4)
     snp_dict = new_snapshot.to_dict()
     archive_data.origin_add([new_origin])
     for i, branch in enumerate(snp_dict["branches"].keys()):
         if i == 0:
             snp_dict["branches"][branch] = None
         else:
             snp_dict["branches"][branch] = {
                 "target_type": "revision",
                 "target": hash_to_bytes(revisions[i - 1]),
             }
 
     archive_data.snapshot_add([Snapshot.from_dict(snp_dict)])
     visit = archive_data.origin_visit_add(
         [
             OriginVisit(
                 origin=new_origin.url,
                 date=visit_dates[0],
                 type="git",
             )
         ]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="partial",
         snapshot=snp_dict["id"],
     )
     archive_data.origin_visit_status_add([visit_status])
 
     url = reverse(
         "browse-origin-directory", query_params={"origin_url": new_origin.url}
     )
 
     check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
 
 
 @given(
     new_origin(),
     new_snapshot(min_size=4, max_size=4),
     visit_dates(),
 )
 def test_origin_snapshot_invalid_branch(
     client,
     archive_data,
     revisions_list,
     new_origin,
     new_snapshot,
     visit_dates,
 ):
     revisions = revisions_list(size=4)
     snp_dict = new_snapshot.to_dict()
     archive_data.origin_add([new_origin])
     for i, branch in enumerate(snp_dict["branches"].keys()):
         snp_dict["branches"][branch] = {
             "target_type": "revision",
             "target": hash_to_bytes(revisions[i]),
         }
 
     archive_data.snapshot_add([Snapshot.from_dict(snp_dict)])
     visit = archive_data.origin_visit_add(
         [
             OriginVisit(
                 origin=new_origin.url,
                 date=visit_dates[0],
                 type="git",
             )
         ]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="full",
         snapshot=snp_dict["id"],
     )
     archive_data.origin_visit_status_add([visit_status])
 
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": new_origin.url, "branch": "invalid_branch"},
     )
 
     check_html_get_response(client, url, status_code=404, template_used="error.html")
 
 
 @given(new_origin())
 def test_browse_visits_origin_not_found(client, new_origin):
     url = reverse("browse-origin-visits", query_params={"origin_url": new_origin.url})
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(
         resp, f"Origin with url {new_origin.url} not found", status_code=404
     )
 
 
 def test_browse_origin_directory_no_visit(client, mocker, origin):
     mock_get_origin_visits = mocker.patch(
         "swh.web.utils.origin_visits.get_origin_visits"
     )
     mock_get_origin_visits.return_value = []
     mock_archive = mocker.patch("swh.web.utils.origin_visits.archive")
     mock_archive.lookup_origin_visit_latest.return_value = None
     url = reverse("browse-origin-directory", query_params={"origin_url": origin["url"]})
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(resp, "No valid visit", status_code=404)
     assert not mock_get_origin_visits.called
 
 
 def test_browse_origin_directory_unknown_visit(client, origin):
 
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": origin["url"], "visit_id": 200},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert re.search("visit.*not found", resp.content.decode("utf-8"))
 
 
 def test_browse_origin_directory_not_found(client, origin):
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": origin["url"], "path": "/invalid/dir/path/"},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=404, template_used="browse/directory.html"
+        client, url, status_code=404, template_used="browse-directory.html"
     )
     assert re.search("Directory.*not found", resp.content.decode("utf-8"))
 
 
 def _add_empty_snapshot_origin(new_origin, archive_data):
     snapshot = Snapshot(branches={})
     archive_data.origin_add([new_origin])
     archive_data.snapshot_add([snapshot])
     visit = archive_data.origin_visit_add(
         [
             OriginVisit(
                 origin=new_origin.url,
                 date=now(),
                 type="git",
             )
         ]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="full",
         snapshot=snapshot.id,
     )
     archive_data.origin_visit_status_add([visit_status])
 
 
 @pytest.mark.django_db
 @pytest.mark.parametrize("object_type", ["directory"])
 @given(new_origin())
 def test_browse_origin_content_directory_empty_snapshot(
     client, staff_user, archive_data, object_type, new_origin
 ):
 
     _add_empty_snapshot_origin(new_origin, archive_data)
 
     # to check proper generation of raw extrinsic metadata api links
     client.force_login(staff_user)
 
     url = reverse(
         f"browse-origin-{object_type}",
         query_params={"origin_url": new_origin.url, "path": "baz"},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used=f"browse/{object_type}.html"
+        client, url, status_code=200, template_used=f"browse-{object_type}.html"
     )
     assert re.search("snapshot.*is empty", resp.content.decode("utf-8"))
 
 
 def test_browse_directory_snapshot_not_found(client, mocker, origin):
     mock_get_snapshot_context = mocker.patch(
         "swh.web.browse.snapshot_context.get_snapshot_context"
     )
     mock_get_snapshot_context.side_effect = NotFoundExc("Snapshot not found")
     url = reverse("browse-origin-directory", query_params={"origin_url": origin["url"]})
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(resp, "Snapshot not found", status_code=404)
     assert mock_get_snapshot_context.called
 
 
 @given(new_origin())
 def test_origin_empty_snapshot(client, archive_data, new_origin):
 
     _add_empty_snapshot_origin(new_origin, archive_data)
 
     url = reverse(
         "browse-origin-directory", query_params={"origin_url": new_origin.url}
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
     resp_content = resp.content.decode("utf-8")
     assert re.search("snapshot.*is empty", resp_content)
     assert not re.search("swh-tr-link", resp_content)
 
 
 @given(new_origin())
 def test_origin_empty_snapshot_null_revision(client, archive_data, new_origin):
     snapshot = Snapshot(
         branches={
             b"HEAD": SnapshotBranch(
                 target="refs/head/master".encode(),
                 target_type=TargetType.ALIAS,
             ),
             b"refs/head/master": None,
         }
     )
     archive_data.origin_add([new_origin])
     archive_data.snapshot_add([snapshot])
     visit = archive_data.origin_visit_add(
         [
             OriginVisit(
                 origin=new_origin.url,
                 date=now(),
                 type="git",
             )
         ]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="partial",
         snapshot=snapshot.id,
     )
     archive_data.origin_visit_status_add([visit_status])
 
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": new_origin.url},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
     resp_content = resp.content.decode("utf-8")
     assert re.search("snapshot.*is empty", resp_content)
     assert not re.search("swh-tr-link", resp_content)
 
 
 def test_origin_release_browse(client, archive_data, origin_with_releases):
     origin_url = origin_with_releases["url"]
     snapshot = archive_data.snapshot_get_latest(origin_url)
     release = [
         b for b in snapshot["branches"].values() if b["target_type"] == "release"
     ][-1]
     release_data = archive_data.release_get(release["target"])
     revision_data = archive_data.revision_get(release_data["target"])
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": origin_url, "release": release_data["name"]},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
     assert_contains(resp, release_data["name"])
     assert_contains(resp, release["target"])
 
     swhid_context = {
         "origin": origin_url,
         "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         "anchor": gen_swhid(ObjectType.RELEASE, release_data["id"]),
     }
 
     swh_dir_id = gen_swhid(
         ObjectType.DIRECTORY, revision_data["directory"], metadata=swhid_context
     )
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
 
 
 def test_origin_release_browse_not_found(client, origin_with_releases):
 
     invalid_release_name = "swh-foo-bar"
     url = reverse(
         "browse-origin-directory",
         query_params={
             "origin_url": origin_with_releases["url"],
             "release": invalid_release_name,
         },
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert re.search(
         f"Release {invalid_release_name}.*not found", resp.content.decode("utf-8")
     )
 
 
 @given(new_origin())
 def test_origin_browse_directory_branch_with_non_resolvable_revision(
     client,
     archive_data,
     unknown_revision,
     new_origin,
 ):
     branch_name = "master"
     snapshot = Snapshot(
         branches={
             branch_name.encode(): SnapshotBranch(
                 target=hash_to_bytes(unknown_revision),
                 target_type=TargetType.REVISION,
             )
         }
     )
     archive_data.origin_add([new_origin])
     archive_data.snapshot_add([snapshot])
     visit = archive_data.origin_visit_add(
         [
             OriginVisit(
                 origin=new_origin.url,
                 date=now(),
                 type="git",
             )
         ]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="partial",
         snapshot=snapshot.id,
     )
     archive_data.origin_visit_status_add([visit_status])
 
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": new_origin.url, "branch": branch_name},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
     assert_contains(
         resp, f"Revision {unknown_revision } could not be found in the archive."
     )
 
     # no revision card
     assert_not_contains(resp, "swh-tip-revision")
     # no Download dropdown
     assert_not_contains(resp, "swh-vault-download")
     # no History link
     assert_not_contains(resp, "swh-tr-link")
     # no SWHIDs for directory and revision
     assert_not_contains(resp, "swh:1:dir:")
     assert_not_contains(resp, "swh:1:rev:")
 
 
 def test_origin_views_no_url_query_parameter(client):
     for browse_context in (
         "directory",
         "visits",
     ):
         url = reverse(f"browse-origin-{browse_context}")
         resp = check_html_get_response(
             client, url, status_code=400, template_used="error.html"
         )
         assert_contains(
             resp,
             "An origin URL must be provided as query parameter.",
             status_code=400,
         )
 
 
 @given(new_origin())
 @pytest.mark.parametrize("browse_context", ["log", "branches", "releases"])
 def test_origin_view_redirects(client, browse_context, new_origin):
     query_params = {"origin_url": new_origin.url}
     url = reverse(f"browse-origin-{browse_context}", query_params=query_params)
 
     resp = check_html_get_response(client, url, status_code=301)
     assert resp["location"] == reverse(
         f"browse-snapshot-{browse_context}", query_params=query_params
     )
 
 
 @given(new_origin())
 @pytest.mark.parametrize("browse_context", ["content"])
 def test_origin_content_view_redirects(client, browse_context, new_origin):
     query_params = {"origin_url": new_origin.url, "path": "test.txt"}
     url = reverse(f"browse-origin-{browse_context}", query_params=query_params)
 
     resp = check_html_get_response(client, url, status_code=301)
     assert resp["location"] == reverse(
         f"browse-{browse_context}", query_params=query_params
     )
 
 
 @given(new_origin())
 @pytest.mark.parametrize("browse_context", ["log", "branches", "releases"])
 def test_origin_view_legacy_redirects(client, browse_context, new_origin):
     # Each legacy route corresponds to two URL patterns, testing both
     url_args = [
         {"origin_url": new_origin.url},
         {"origin_url": new_origin.url, "timestamp": "2021-01-23T22:24:10Z"},
     ]
     params = {"extra-param1": "extra-param1", "extra-param2": "extra-param2"}
     for each_arg in url_args:
         url = reverse(
             f"browse-origin-{browse_context}-legacy",
             url_args=each_arg,
             query_params=params,
         )
 
         resp = check_html_get_response(client, url, status_code=301)
         assert resp["location"] == reverse(
             f"browse-snapshot-{browse_context}", query_params={**each_arg, **params}
         )
 
 
 @given(new_origin())
 def test_origin_content_view_legacy_redirects(client, new_origin):
     url_args = [
         {"origin_url": new_origin.url},
         {
             "origin_url": new_origin.url,
             "path": "test.txt",
             "timestamp": "2021-01-23T22:24:10Z",
         },
         {"origin_url": new_origin.url, "path": "test.txt"},
     ]
     params = {"extra-param1": "extra-param1", "extra-param2": "extra-param2"}
     for each_arg in url_args:
         url = reverse(
             "browse-origin-content-legacy",
             url_args=each_arg,
             query_params=params,
         )
 
         resp = check_html_get_response(client, url, status_code=301)
         assert resp["location"] == reverse(
             "browse-content", query_params={**each_arg, **params}
         )
 
 
 def _origin_directory_view_test_helper(
     client,
     staff_user,
     archive_data,
     origin_info,
     origin_visit,
     snapshot_sizes,
     origin_branches,
     origin_releases,
     root_directory_sha1,
     target_directory_sha1,
     directory_entries,
     visit_id=None,
     timestamp=None,
     snapshot_id=None,
     path=None,
 ):
     dirs = [e for e in directory_entries if e["type"] in ("dir", "rev")]
     files = [e for e in directory_entries if e["type"] == "file"]
 
     if not visit_id and not snapshot_id:
         visit_id = origin_visit["visit"]
 
     query_params = {"origin_url": origin_info["url"]}
 
     if timestamp:
         query_params["timestamp"] = timestamp
     elif visit_id:
         query_params["visit_id"] = visit_id
     else:
         query_params["snapshot"] = snapshot_id
 
     if path:
         query_params["path"] = path
 
     url = reverse("browse-origin-directory", query_params=query_params)
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
     assert_contains(resp, '<td class="swh-directory">', count=len(dirs))
     assert_contains(resp, '<td class="swh-content">', count=len(files))
 
     if timestamp:
         query_params["timestamp"] = format_utc_iso_date(
             parse_iso8601_date_to_utc(timestamp).isoformat(), "%Y-%m-%dT%H:%M:%SZ"
         )
 
     for d in dirs:
         if d["type"] == "rev":
             dir_url = reverse("browse-revision", url_args={"sha1_git": d["target"]})
         else:
             dir_path = d["name"]
             if path:
                 dir_path = "%s/%s" % (path, d["name"])
             query_params["path"] = dir_path
             dir_url = reverse(
                 "browse-origin-directory",
                 query_params=query_params,
             )
         assert_contains(resp, dir_url)
 
     for f in files:
         file_path = f["name"]
         if path:
             file_path = "%s/%s" % (path, f["name"])
         query_params["path"] = file_path
         file_url = reverse("browse-origin-content", query_params=query_params)
         assert_contains(resp, file_url)
 
     if "path" in query_params:
         del query_params["path"]
 
     root_dir_branch_url = reverse("browse-origin-directory", query_params=query_params)
 
     nb_bc_paths = 1
     if path:
         nb_bc_paths = len(path.split("/")) + 1
 
     assert_contains(resp, '<li class="swh-path">', count=nb_bc_paths)
     assert_contains(
         resp, '<a href="%s">%s</a>' % (root_dir_branch_url, root_directory_sha1[:7])
     )
 
     origin_branches_url = reverse("browse-origin-branches", query_params=query_params)
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse("browse-origin-releases", query_params=query_params)
 
     nb_releases = len(origin_releases)
     if nb_releases > 0:
         assert_contains(resp, f'href="{escape(origin_releases_url)}"')
         assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
 
     if path:
         query_params["path"] = path
 
     assert_contains(resp, '<li class="swh-branch">', count=len(origin_branches))
 
     for branch in origin_branches:
         query_params["branch"] = branch["name"]
         root_dir_branch_url = reverse(
             "browse-origin-directory", query_params=query_params
         )
 
         assert_contains(resp, '<a href="%s">' % root_dir_branch_url)
 
     assert_contains(resp, '<li class="swh-release">', count=len(origin_releases))
 
     query_params["branch"] = None
     for release in origin_releases:
         query_params["release"] = release["name"]
         root_dir_release_url = reverse(
             "browse-origin-directory", query_params=query_params
         )
 
         assert_contains(resp, 'href="%s"' % root_dir_release_url)
 
     assert_contains(resp, "vault-cook-directory")
     assert_contains(resp, "vault-cook-revision")
 
     snapshot = archive_data.snapshot_get(origin_visit["snapshot"])
     head_rev_id = archive_data.snapshot_get_head(snapshot)
 
     swhid_context = {
         "origin": origin_info["url"],
         "visit": gen_swhid(ObjectType.SNAPSHOT, snapshot["id"]),
         "anchor": gen_swhid(ObjectType.REVISION, head_rev_id),
         "path": f"/{path}" if path else None,
     }
 
     swh_dir_id = gen_swhid(
         ObjectType.DIRECTORY, directory_entries[0]["dir_id"], metadata=swhid_context
     )
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
 
     assert_contains(resp, "swh-take-new-snapshot")
 
     _check_origin_link(resp, origin_info["url"])
 
     assert_not_contains(resp, "swh-metadata-popover")
 
     # Finally, check "Extrinsic metadata" dropdown:
 
     origin_metadata_api_url = reverse(
         "api-1-raw-extrinsic-metadata-origin-authorities",
         url_args={"origin_url": origin_info["url"]},
     )
     directory_metadata_api_url = reverse(
         "api-1-raw-extrinsic-metadata-swhid-authorities",
         url_args={"target": f"swh:1:dir:{target_directory_sha1}"},
     )
     extrinsic_metadata_snippets = [
         "Extrinsic metadata",
         f'<a href="{origin_metadata_api_url}" class="dropdown-item" role="button">',
         f'<a href="{directory_metadata_api_url}" class="dropdown-item" role="button">',
     ]
 
     client.logout()
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
     # None of the above should be present for logged-out users
     for snippet in extrinsic_metadata_snippets:
         assert_not_contains(resp, snippet)
 
     client.force_login(staff_user)
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
 
     # But they should for staff users
     for snippet in extrinsic_metadata_snippets:
         assert_contains(resp, snippet)
 
     client.logout()
 
 
 def _check_origin_link(resp, origin_url):
     browse_origin_url = reverse(
         "browse-origin", query_params={"origin_url": origin_url}
     )
     assert_contains(resp, f'href="{browse_origin_url}"')
 
 
 def test_browse_pull_request_branch(
     client, archive_data, origin_with_pull_request_branches
 ):
     origin_url = origin_with_pull_request_branches.url
     snapshot = archive_data.snapshot_get_latest(origin_url)
     pr_branch = random.choice(
         [
             branch
             for branch in snapshot["branches"].keys()
             if branch.startswith("refs/pull/")
         ]
     )
     url = reverse(
         "browse-origin-directory",
         query_params={"origin_url": origin_url, "branch": pr_branch},
     )
     check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
diff --git a/swh/web/tests/browse/views/test_release.py b/swh/web/tests/browse/views/test_release.py
index b95cdf26..2d8bc882 100644
--- a/swh/web/tests/browse/views/test_release.py
+++ b/swh/web/tests/browse/views/test_release.py
@@ -1,164 +1,164 @@
-# Copyright (C) 2018-2021  The Software Heritage developers
+# Copyright (C) 2018-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 
 from django.utils.html import escape
 
 from swh.model.swhids import ObjectType
 from swh.web.tests.django_asserts import assert_contains
 from swh.web.tests.helpers import check_html_get_response
 from swh.web.utils import format_utc_iso_date, reverse
 from swh.web.utils.identifiers import gen_swhid
 
 
 def test_release_browse(client, archive_data, release):
     _release_browse_checks(client, release, archive_data)
 
 
 def test_release_browse_with_origin_snapshot(
     client, archive_data, origin_with_releases
 ):
     origin_url = origin_with_releases["url"]
     snapshot = archive_data.snapshot_get_latest(origin_url)
     release = random.choice(
         [
             b["target"]
             for b in snapshot["branches"].values()
             if b["target_type"] == "release"
         ]
     )
 
     _release_browse_checks(client, release, archive_data, origin_url=origin_url)
     _release_browse_checks(client, release, archive_data, snapshot_id=snapshot["id"])
     _release_browse_checks(
         client,
         release,
         archive_data,
         origin_url=origin_url,
         snapshot_id=snapshot["id"],
     )
 
 
 def test_release_browse_not_found(client, archive_data, unknown_release):
     url = reverse("browse-release", url_args={"sha1_git": unknown_release})
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     err_msg = "Release with sha1_git %s not found" % unknown_release
     assert_contains(resp, err_msg, status_code=404)
 
 
 def test_release_uppercase(client, release):
     url = reverse(
         "browse-release-uppercase-checksum", url_args={"sha1_git": release.upper()}
     )
 
     resp = check_html_get_response(client, url, status_code=302)
 
     redirect_url = reverse("browse-release", url_args={"sha1_git": release})
 
     assert resp["location"] == redirect_url
 
 
 def _release_browse_checks(
     client, release, archive_data, origin_url=None, snapshot_id=None
 ):
     query_params = {"origin_url": origin_url, "snapshot": snapshot_id}
 
     url = reverse(
         "browse-release", url_args={"sha1_git": release}, query_params=query_params
     )
 
     release_data = archive_data.release_get(release)
 
     release_id = release_data["id"]
     release_name = release_data["name"]
     author_name = release_data["author"]["name"]
 
     release_date = release_data["date"]
     message = release_data["message"]
     target_type = release_data["target_type"]
     target = release_data["target"]
 
     target_url = reverse(
         "browse-revision", url_args={"sha1_git": target}, query_params=query_params
     )
     message_lines = message.split("\n")
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/release.html"
+        client, url, status_code=200, template_used="browse-release.html"
     )
     assert_contains(resp, author_name)
     assert_contains(resp, format_utc_iso_date(release_date))
     assert_contains(
         resp,
         "<h6>%s</h6>%s" % (message_lines[0] or "None", "\n".join(message_lines[1:])),
     )
     assert_contains(resp, release_id)
     assert_contains(resp, release_name)
     assert_contains(resp, target_type)
     assert_contains(resp, '<a href="%s">%s</a>' % (escape(target_url), target))
 
     swh_rel_id = gen_swhid(ObjectType.RELEASE, release_id)
     swh_rel_id_url = reverse("browse-swhid", url_args={"swhid": swh_rel_id})
     assert_contains(resp, swh_rel_id)
     assert_contains(resp, swh_rel_id_url)
 
     if origin_url:
         browse_origin_url = reverse(
             "browse-origin", query_params={"origin_url": origin_url}
         )
         assert_contains(resp, f'href="{browse_origin_url}"')
     elif snapshot_id:
         swh_snp_id = gen_swhid(ObjectType.SNAPSHOT, snapshot_id)
         swh_snp_id_url = reverse("browse-swhid", url_args={"swhid": swh_snp_id})
         assert_contains(resp, f'href="{swh_snp_id_url}"')
 
     if release_data["target_type"] == "revision":
         rev = archive_data.revision_get(release_data["target"])
         rev_dir = rev["directory"]
         rev_metadata = {}
         dir_metadata = {}
         if origin_url:
             directory_url = reverse(
                 "browse-origin-directory",
                 query_params={
                     "origin_url": origin_url,
                     "release": release_data["name"],
                     "snapshot": snapshot_id,
                 },
             )
             rev_metadata["origin"] = dir_metadata["origin"] = origin_url
             snapshot = archive_data.snapshot_get_latest(origin_url)
             rev_metadata["visit"] = dir_metadata["visit"] = gen_swhid(
                 ObjectType.SNAPSHOT, snapshot["id"]
             )
             dir_metadata["anchor"] = gen_swhid(ObjectType.RELEASE, release_id)
 
         elif snapshot_id:
             directory_url = reverse(
                 "browse-snapshot-directory",
                 url_args={"snapshot_id": snapshot_id},
                 query_params={
                     "release": release_data["name"],
                 },
             )
             rev_metadata["visit"] = dir_metadata["visit"] = gen_swhid(
                 ObjectType.SNAPSHOT, snapshot_id
             )
             dir_metadata["anchor"] = gen_swhid(ObjectType.RELEASE, release_id)
         else:
             directory_url = reverse("browse-directory", url_args={"sha1_git": rev_dir})
         assert_contains(resp, escape(directory_url))
 
         swh_rev_id = gen_swhid(ObjectType.REVISION, rev["id"], metadata=rev_metadata)
         swh_rev_id_url = reverse("browse-swhid", url_args={"swhid": swh_rev_id})
         assert_contains(resp, swh_rev_id_url)
 
         swh_dir_id = gen_swhid(ObjectType.DIRECTORY, rev_dir, metadata=dir_metadata)
         swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
         assert_contains(resp, swh_dir_id_url)
diff --git a/swh/web/tests/browse/views/test_revision.py b/swh/web/tests/browse/views/test_revision.py
index 4661e861..579c70ea 100644
--- a/swh/web/tests/browse/views/test_revision.py
+++ b/swh/web/tests/browse/views/test_revision.py
@@ -1,346 +1,346 @@
-# Copyright (C) 2017-2021  The Software Heritage developers
+# Copyright (C) 2017-2022  The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import json
 import random
 
 from hypothesis import given
 
 from django.utils.html import escape
 
 from swh.model.hashutil import hash_to_bytes, hash_to_hex
 from swh.model.model import Revision, RevisionType, TimestampWithTimezone
 from swh.model.swhids import ObjectType
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
 from swh.web.tests.helpers import check_html_get_response
 from swh.web.tests.strategies import new_origin, new_person, new_swh_date
 from swh.web.utils import format_utc_iso_date, parse_iso8601_date_to_utc, reverse
 from swh.web.utils.identifiers import gen_swhid
 
 
 def test_revision_browse(client, archive_data, revision):
     _revision_browse_checks(client, archive_data, revision)
 
 
 def test_revision_origin_snapshot_browse(client, archive_data, swh_scheduler, origin):
     snapshot = archive_data.snapshot_get_latest(origin["url"])
     revision = archive_data.snapshot_get_head(snapshot)
 
     _revision_browse_checks(client, archive_data, revision, origin_url=origin["url"])
     _revision_browse_checks(client, archive_data, revision, snapshot=snapshot)
     _revision_browse_checks(
         client,
         archive_data,
         revision,
         origin_url=origin["url"],
         snapshot=snapshot,
     )
 
     revision = random.choice(archive_data.revision_log(revision))["id"]
     _revision_browse_checks(client, archive_data, revision, origin_url=origin["url"])
 
 
 def test_revision_log_browse(client, archive_data, revision):
     per_page = 10
 
     revision_log = archive_data.revision_log(revision)
 
     revision_log_sorted = sorted(
         revision_log,
         key=lambda rev: -parse_iso8601_date_to_utc(rev["committer_date"]).timestamp(),
     )
 
     url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"per_page": per_page},
     )
 
     next_page_url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={
             "offset": per_page,
             "per_page": per_page,
         },
     )
 
     nb_log_entries = per_page
     if len(revision_log_sorted) < per_page:
         nb_log_entries = len(revision_log_sorted)
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/revision-log.html"
+        client, url, status_code=200, template_used="browse-revision-log.html"
     )
     assert_contains(resp, '<tr class="swh-revision-log-entry', count=nb_log_entries)
     assert_contains(resp, '<a class="page-link">Newer</a>')
 
     if len(revision_log_sorted) > per_page:
         assert_contains(
             resp,
             '<a class="page-link" href="%s">Older</a>' % escape(next_page_url),
         )
 
     for log in revision_log_sorted[:per_page]:
         revision_url = reverse("browse-revision", url_args={"sha1_git": log["id"]})
         assert_contains(resp, log["id"][:7])
         assert_contains(resp, log["author"]["name"])
         assert_contains(resp, format_utc_iso_date(log["date"]))
         assert_contains(resp, escape(log["message"]))
         assert_contains(resp, format_utc_iso_date(log["committer_date"]))
         assert_contains(resp, revision_url)
 
     if len(revision_log_sorted) <= per_page:
         return
 
     resp = check_html_get_response(
-        client, next_page_url, status_code=200, template_used="browse/revision-log.html"
+        client, next_page_url, status_code=200, template_used="browse-revision-log.html"
     )
 
     prev_page_url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"offset": 0, "per_page": per_page},
     )
     next_page_url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"offset": 2 * per_page, "per_page": per_page},
     )
 
     nb_log_entries = len(revision_log_sorted) - per_page
     if nb_log_entries > per_page:
         nb_log_entries = per_page
 
     assert_contains(resp, '<tr class="swh-revision-log-entry', count=nb_log_entries)
 
     assert_contains(
         resp, '<a class="page-link" href="%s">Newer</a>' % escape(prev_page_url)
     )
 
     if len(revision_log_sorted) > 2 * per_page:
         assert_contains(
             resp,
             '<a class="page-link" href="%s">Older</a>' % escape(next_page_url),
         )
 
     if len(revision_log_sorted) <= 2 * per_page:
         return
 
     resp = check_html_get_response(
-        client, next_page_url, status_code=200, template_used="browse/revision-log.html"
+        client, next_page_url, status_code=200, template_used="browse-revision-log.html"
     )
 
     prev_page_url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"offset": per_page, "per_page": per_page},
     )
     next_page_url = reverse(
         "browse-revision-log",
         url_args={"sha1_git": revision},
         query_params={"offset": 3 * per_page, "per_page": per_page},
     )
 
     nb_log_entries = len(revision_log_sorted) - 2 * per_page
     if nb_log_entries > per_page:
         nb_log_entries = per_page
 
     assert_contains(resp, '<tr class="swh-revision-log-entry', count=nb_log_entries)
     assert_contains(
         resp, '<a class="page-link" href="%s">Newer</a>' % escape(prev_page_url)
     )
 
     if len(revision_log_sorted) > 3 * per_page:
         assert_contains(
             resp,
             '<a class="page-link" href="%s">Older</a>' % escape(next_page_url),
         )
 
 
 @given(new_origin())
 def test_revision_request_errors(client, revision, unknown_revision, new_origin):
     url = reverse("browse-revision", url_args={"sha1_git": unknown_revision})
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(
         resp, "Revision with sha1_git %s not found" % unknown_revision, status_code=404
     )
 
     url = reverse(
         "browse-revision",
         url_args={"sha1_git": revision},
         query_params={"origin_url": new_origin.url},
     )
 
     resp = check_html_get_response(
         client, url, status_code=404, template_used="error.html"
     )
     assert_contains(
         resp, "the origin mentioned in your request" " appears broken", status_code=404
     )
 
 
 def test_revision_uppercase(client, revision):
     url = reverse(
         "browse-revision-uppercase-checksum", url_args={"sha1_git": revision.upper()}
     )
 
     resp = check_html_get_response(client, url, status_code=302)
 
     redirect_url = reverse("browse-revision", url_args={"sha1_git": revision})
 
     assert resp["location"] == redirect_url
 
 
 def _revision_browse_checks(
     client, archive_data, revision, origin_url=None, snapshot=None
 ):
 
     query_params = {}
     if origin_url:
         query_params["origin_url"] = origin_url
     if snapshot:
         query_params["snapshot"] = snapshot["id"]
 
     url = reverse(
         "browse-revision", url_args={"sha1_git": revision}, query_params=query_params
     )
 
     revision_data = archive_data.revision_get(revision)
 
     author_name = revision_data["author"]["name"]
     committer_name = revision_data["committer"]["name"]
     dir_id = revision_data["directory"]
 
     if origin_url:
         snapshot = archive_data.snapshot_get_latest(origin_url)
         history_url = reverse(
             "browse-origin-log",
             query_params={"revision": revision, **query_params},
         )
     elif snapshot:
         history_url = reverse(
             "browse-snapshot-log",
             url_args={"snapshot_id": snapshot["id"]},
             query_params={"revision": revision},
         )
     else:
         history_url = reverse("browse-revision-log", url_args={"sha1_git": revision})
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/revision.html"
+        client, url, status_code=200, template_used="browse-revision.html"
     )
     assert_contains(resp, author_name)
     assert_contains(resp, committer_name)
     assert_contains(resp, history_url)
 
     for parent in revision_data["parents"]:
         parent_url = reverse(
             "browse-revision", url_args={"sha1_git": parent}, query_params=query_params
         )
         assert_contains(resp, '<a href="%s">%s</a>' % (escape(parent_url), parent[:7]))
 
     author_date = revision_data["date"]
     committer_date = revision_data["committer_date"]
 
     message_lines = revision_data["message"].split("\n")
 
     assert_contains(resp, format_utc_iso_date(author_date))
     assert_contains(resp, format_utc_iso_date(committer_date))
     assert_contains(resp, escape(message_lines[0]))
     assert_contains(resp, escape("\n".join(message_lines[1:])))
 
     assert_contains(resp, "vault-cook-directory")
     assert_contains(resp, "vault-cook-revision")
 
     swh_rev_id = gen_swhid(ObjectType.REVISION, revision)
     swh_rev_id_url = reverse("browse-swhid", url_args={"swhid": swh_rev_id})
     assert_contains(resp, swh_rev_id)
     assert_contains(resp, swh_rev_id_url)
 
     swh_dir_id = gen_swhid(ObjectType.DIRECTORY, dir_id)
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
 
     if origin_url:
         assert_contains(resp, "swh-take-new-snapshot")
 
     swh_rev_id = gen_swhid(ObjectType.REVISION, revision)
     swh_rev_id_url = reverse("browse-swhid", url_args={"swhid": swh_rev_id})
 
     if origin_url:
         browse_origin_url = reverse(
             "browse-origin", query_params={"origin_url": origin_url}
         )
         assert_contains(resp, f'href="{browse_origin_url}"')
     elif snapshot:
         swh_snp_id = gen_swhid(ObjectType.SNAPSHOT, snapshot["id"])
         swh_snp_id_url = reverse("browse-swhid", url_args={"swhid": swh_snp_id})
         assert_contains(resp, f'href="{swh_snp_id_url}"')
 
     swhid_context = {}
     if origin_url:
         swhid_context["origin"] = origin_url
     if snapshot:
         swhid_context["visit"] = gen_swhid(ObjectType.SNAPSHOT, snapshot["id"])
 
     swh_rev_id = gen_swhid(ObjectType.REVISION, revision, metadata=swhid_context)
     swh_rev_id_url = reverse("browse-swhid", url_args={"swhid": swh_rev_id})
     assert_contains(resp, swh_rev_id)
     assert_contains(resp, swh_rev_id_url)
 
     swhid_context["anchor"] = gen_swhid(ObjectType.REVISION, revision)
 
     swh_dir_id = gen_swhid(ObjectType.DIRECTORY, dir_id, metadata=swhid_context)
     swh_dir_id_url = reverse("browse-swhid", url_args={"swhid": swh_dir_id})
     assert_contains(resp, swh_dir_id)
     assert_contains(resp, swh_dir_id_url)
 
 
 def test_revision_invalid_path(client, archive_data, revision):
     path = "foo/bar"
     url = reverse(
         "browse-revision", url_args={"sha1_git": revision}, query_params={"path": path}
     )
 
     resp = check_html_get_response(
-        client, url, status_code=404, template_used="browse/revision.html"
+        client, url, status_code=404, template_used="browse-revision.html"
     )
 
     directory = archive_data.revision_get(revision)["directory"]
     error_message = (
         f"Directory entry with path {path} from root directory {directory} not found"
     )
     assert_contains(resp, error_message, status_code=404)
     assert_not_contains(resp, "swh-metadata-popover", status_code=404)
 
 
 @given(new_person(), new_swh_date())
 def test_revision_metadata_display(archive_data, client, directory, person, date):
     metadata = {"foo": "bar"}
     revision = Revision(
         directory=hash_to_bytes(directory),
         author=person,
         committer=person,
         message=b"commit message",
         date=TimestampWithTimezone.from_datetime(date),
         committer_date=TimestampWithTimezone.from_datetime(date),
         synthetic=False,
         type=RevisionType.GIT,
         metadata=metadata,
     )
     archive_data.revision_add([revision])
 
     url = reverse("browse-revision", url_args={"sha1_git": hash_to_hex(revision.id)})
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/revision.html"
+        client, url, status_code=200, template_used="browse-revision.html"
     )
     assert_contains(resp, "swh-metadata-popover")
     assert_contains(resp, escape(json.dumps(metadata, indent=4)))
diff --git a/swh/web/tests/browse/views/test_snapshot.py b/swh/web/tests/browse/views/test_snapshot.py
index c6bfa485..a5595375 100644
--- a/swh/web/tests/browse/views/test_snapshot.py
+++ b/swh/web/tests/browse/views/test_snapshot.py
@@ -1,448 +1,448 @@
-# Copyright (C) 2021 The Software Heritage developers
+# Copyright (C) 2022 The Software Heritage developers
 # See the AUTHORS file at the top-level directory of this distribution
 # License: GNU Affero General Public License version 3, or any later version
 # See top-level LICENSE file for more information
 
 import random
 import re
 import string
 
 from dateutil import parser
 from hypothesis import given
 import pytest
 
 from django.utils.html import escape
 
 from swh.model.hashutil import hash_to_bytes
 from swh.model.model import (
     ObjectType,
     OriginVisit,
     OriginVisitStatus,
     Release,
     Revision,
     RevisionType,
     Snapshot,
     SnapshotBranch,
     TargetType,
     TimestampWithTimezone,
 )
 from swh.storage.utils import now
 from swh.web.browse.snapshot_context import process_snapshot_branches
 from swh.web.tests.data import random_sha1
 from swh.web.tests.django_asserts import assert_contains, assert_not_contains
 from swh.web.tests.helpers import check_html_get_response
 from swh.web.tests.strategies import new_origin, new_person, new_swh_date, visit_dates
 from swh.web.utils import reverse
 
 
 @pytest.mark.parametrize(
     "browse_context,template_used",
     [
         ("log", "revision-log.html"),
         ("branches", "branches.html"),
         ("releases", "releases.html"),
     ],
 )
 def test_snapshot_browse_with_id(client, browse_context, template_used, snapshot):
     url = reverse(
         f"browse-snapshot-{browse_context}", url_args={"snapshot_id": snapshot}
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used=f"browse/{template_used}"
+        client, url, status_code=200, template_used=f"browse-{template_used}"
     )
     assert_contains(resp, f"swh:1:snp:{snapshot}")
 
 
 @pytest.mark.parametrize("browse_context", ["log", "branches", "releases"])
 def test_snapshot_browse_with_id_and_origin(
     client, browse_context, archive_data, origin
 ):
     snapshot = archive_data.snapshot_get_latest(origin["url"])
     url = reverse(
         f"browse-snapshot-{browse_context}",
         url_args={"snapshot_id": snapshot["id"]},
         query_params={"origin_url": origin["url"]},
     )
 
     resp = check_html_get_response(
         client, url, status_code=200, template_used="includes/snapshot-context.html"
     )
     assert_contains(resp, origin["url"])
 
 
 @pytest.mark.parametrize("browse_context", ["log", "branches", "releases"])
 def test_snapshot_browse_with_id_origin_and_timestamp(
     client, browse_context, archive_data, origin_with_multiple_visits
 ):
     visit = archive_data.origin_visit_get(origin_with_multiple_visits["url"])[0]
     url = reverse(
         f"browse-snapshot-{browse_context}",
         url_args={"snapshot_id": visit["snapshot"]},
         query_params={"origin_url": visit["origin"], "timestamp": visit["date"]},
     )
     resp = check_html_get_response(
         client, url, status_code=200, template_used="includes/snapshot-context.html"
     )
     requested_time = parser.parse(visit["date"]).strftime("%d %B %Y, %H:%M")
     assert_contains(resp, requested_time)
     assert_contains(resp, visit["origin"])
 
 
 @pytest.mark.parametrize("browse_context", ["log", "branches", "releases"])
 def test_snapshot_browse_without_id(client, browse_context, archive_data, origin):
     url = reverse(
         f"browse-snapshot-{browse_context}", query_params={"origin_url": origin["url"]}
     )
     # This will be redirected to /snapshot/<latest_snapshot_id>/log
     resp = check_html_get_response(
         client,
         url,
         status_code=302,
     )
     snapshot = archive_data.snapshot_get_latest(origin["url"])
 
     assert resp.url == reverse(
         f"browse-snapshot-{browse_context}",
         url_args={"snapshot_id": snapshot["id"]},
         query_params={"origin_url": origin["url"]},
     )
 
 
 @pytest.mark.parametrize("browse_context", ["log", "branches", "releases"])
 def test_snapshot_browse_without_id_and_origin(client, browse_context):
     url = reverse(f"browse-snapshot-{browse_context}")
     resp = check_html_get_response(
         client,
         url,
         status_code=400,
     )
     # assert_contains works only with a success response, using re.search instead
     assert re.search(
         "An origin URL must be provided as a query parameter",
         resp.content.decode("utf-8"),
     )
 
 
 def test_snapshot_browse_branches(client, archive_data, origin):
     snapshot = archive_data.snapshot_get_latest(origin["url"])
 
     snapshot_sizes = archive_data.snapshot_count_branches(snapshot["id"])
     snapshot_content = process_snapshot_branches(snapshot)
 
     _origin_branches_test_helper(
         client, origin, snapshot_content, snapshot_sizes, snapshot_id=snapshot["id"]
     )
 
 
 def _origin_branches_test_helper(
     client, origin_info, origin_snapshot, snapshot_sizes, snapshot_id
 ):
     query_params = {"origin_url": origin_info["url"], "snapshot": snapshot_id}
 
     url = reverse(
         "browse-snapshot-branches",
         url_args={"snapshot_id": snapshot_id},
         query_params=query_params,
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/branches.html"
+        client, url, status_code=200, template_used="browse-branches.html"
     )
 
     origin_branches = origin_snapshot[0]
     origin_releases = origin_snapshot[1]
     origin_branches_url = reverse("browse-origin-branches", query_params=query_params)
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse("browse-origin-releases", query_params=query_params)
 
     nb_releases = len(origin_releases)
     if nb_releases > 0:
         assert_contains(resp, f'href="{escape(origin_releases_url)}">')
         assert_contains(resp, f"Releases ({snapshot_sizes['release']})")
 
     assert_contains(resp, '<tr class="swh-branch-entry', count=len(origin_branches))
 
     for branch in origin_branches:
         browse_branch_url = reverse(
             "browse-origin-directory",
             query_params={"branch": branch["name"], **query_params},
         )
         assert_contains(resp, '<a href="%s">' % escape(browse_branch_url))
 
         browse_revision_url = reverse(
             "browse-revision",
             url_args={"sha1_git": branch["revision"]},
             query_params=query_params,
         )
         assert_contains(resp, '<a href="%s">' % escape(browse_revision_url))
 
     _check_origin_link(resp, origin_info["url"])
 
 
 def _check_origin_link(resp, origin_url):
     browse_origin_url = reverse(
         "browse-origin", query_params={"origin_url": origin_url}
     )
     assert_contains(resp, f'href="{browse_origin_url}"')
 
 
 @given(
     new_origin(),
     visit_dates(),
 )
 def test_snapshot_branches_pagination_with_alias(
     client,
     archive_data,
     mocker,
     release,
     revisions_list,
     new_origin,
     visit_dates,
 ):
     """
     When a snapshot contains a branch or a release alias, pagination links
     in the branches / releases view should be displayed.
     """
     revisions = revisions_list(size=10)
     mocker.patch("swh.web.browse.snapshot_context.PER_PAGE", len(revisions) / 2)
     snp_dict = {"branches": {}, "id": hash_to_bytes(random_sha1())}
     for i in range(len(revisions)):
         branch = "".join(random.choices(string.ascii_lowercase, k=8))
         snp_dict["branches"][branch.encode()] = {
             "target_type": "revision",
             "target": hash_to_bytes(revisions[i]),
         }
     release_name = "".join(random.choices(string.ascii_lowercase, k=8))
     snp_dict["branches"][b"RELEASE_ALIAS"] = {
         "target_type": "alias",
         "target": release_name.encode(),
     }
     snp_dict["branches"][release_name.encode()] = {
         "target_type": "release",
         "target": hash_to_bytes(release),
     }
     archive_data.origin_add([new_origin])
     archive_data.snapshot_add([Snapshot.from_dict(snp_dict)])
     visit = archive_data.origin_visit_add(
         [
             OriginVisit(
                 origin=new_origin.url,
                 date=visit_dates[0],
                 type="git",
             )
         ]
     )[0]
     visit_status = OriginVisitStatus(
         origin=new_origin.url,
         visit=visit.visit,
         date=now(),
         status="full",
         snapshot=snp_dict["id"],
     )
     archive_data.origin_visit_status_add([visit_status])
     snapshot = archive_data.snapshot_get_latest(new_origin.url)
     url = reverse(
         "browse-snapshot-branches",
         url_args={"snapshot_id": snapshot["id"]},
         query_params={"origin_url": new_origin.url},
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/branches.html"
+        client, url, status_code=200, template_used="browse-branches.html"
     )
     assert_contains(resp, '<ul class="pagination')
 
 
 def test_pull_request_branches_filtering(
     client, origin_with_pull_request_branches, archive_data
 ):
     origin_url = origin_with_pull_request_branches.url
     # check no pull request branches are displayed in the Branches / Releases dropdown
     url = reverse("browse-origin-directory", query_params={"origin_url": origin_url})
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/directory.html"
+        client, url, status_code=200, template_used="browse-directory.html"
     )
     assert_not_contains(resp, "refs/pull/")
 
     snapshot = archive_data.snapshot_get_latest(origin_url)
     # check no pull request branches are displayed in the branches view
     url = reverse(
         "browse-snapshot-branches",
         url_args={"snapshot_id": snapshot["id"]},
         query_params={"origin_url": origin_url},
     )
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/branches.html"
+        client, url, status_code=200, template_used="browse-branches.html"
     )
     assert_not_contains(resp, "refs/pull/")
 
 
 def test_snapshot_browse_releases(client, archive_data, origin):
     origin_visits = archive_data.origin_visit_get(origin["url"])
 
     visit = origin_visits[-1]
     snapshot = archive_data.snapshot_get(visit["snapshot"])
     snapshot_sizes = archive_data.snapshot_count_branches(snapshot["id"])
     snapshot_content = process_snapshot_branches(snapshot)
 
     _origin_releases_test_helper(
         client, origin, snapshot_content, snapshot_sizes, snapshot_id=visit["snapshot"]
     )
 
 
 def _origin_releases_test_helper(
     client, origin_info, origin_snapshot, snapshot_sizes, snapshot_id=None
 ):
     query_params = {"origin_url": origin_info["url"], "snapshot": snapshot_id}
 
     url = reverse(
         "browse-snapshot-releases",
         url_args={"snapshot_id": snapshot_id},
         query_params=query_params,
     )
 
     resp = check_html_get_response(
-        client, url, status_code=200, template_used="browse/releases.html"
+        client, url, status_code=200, template_used="browse-releases.html"
     )
 
     origin_releases = origin_snapshot[1]
 
     origin_branches_url = reverse("browse-origin-branches", query_params=query_params)
 
     assert_contains(resp, f'href="{escape(origin_branches_url)}"')
     assert_contains(resp, f"Branches ({snapshot_sizes['revision']})")
 
     origin_releases_url = reverse("browse-origin-releases", query_params=query_params)
 
     nb_releases = len(origin_releases)
     if nb_releases > 0:
         assert_contains(resp, f'href="{escape(origin_releases_url)}"')
         assert_contains(resp, f"Releases ({snapshot_sizes['release']}")
 
     assert_contains(resp, '<tr class="swh-release-entry', count=nb_releases)
     assert_contains(resp, 'title="The release', count=nb_releases)
 
     for release in origin_releases:
         query_params["release"] = release["name"]
         browse_release_url = reverse(
             "browse-release",
             url_args={"sha1_git": release["id"]},
             query_params=query_params,
         )
         browse_revision_url = reverse(
             "browse-revision",
             url_args={"sha1_git": release["target"]},
             query_params=query_params,
         )
 
         assert_contains(resp, '<a href="%s">' % escape(browse_release_url))
         assert_contains(resp, '<a href="%s">' % escape(browse_revision_url))
 
     _check_origin_link(resp, origin_info["url"])
 
 
 def test_snapshot_content_redirect(client, snapshot):
     qry = {"extra-arg": "extra"}
     url = reverse(
         "browse-snapshot-content", url_args={"snapshot_id": snapshot}, query_params=qry
     )
     resp = check_html_get_response(client, url, status_code=301)
     assert resp.url == reverse(
         "browse-content", query_params={**{"snapshot_id": snapshot}, **qry}
     )
 
 
 def test_snapshot_content_legacy_redirect(client, snapshot):
     qry = {"extra-arg": "extra"}
     url_args = {"snapshot_id": snapshot, "path": "test.txt"}
     url = reverse("browse-snapshot-content-legacy", url_args=url_args, query_params=qry)
     resp = check_html_get_response(client, url, status_code=301)
     assert resp.url == reverse("browse-content", query_params={**url_args, **qry})
 
 
 def test_browse_snapshot_log_no_revisions(client, archive_data, directory):
     release_name = "v1.0.0"
     release = Release(
         name=release_name.encode(),
         message=f"release {release_name}".encode(),
         target=hash_to_bytes(directory),
         target_type=ObjectType.DIRECTORY,
         synthetic=True,
     )
     archive_data.release_add([release])
 
     snapshot = Snapshot(
         branches={
             b"HEAD": SnapshotBranch(
                 target=release_name.encode(), target_type=TargetType.ALIAS
             ),
             release_name.encode(): SnapshotBranch(
                 target=release.id, target_type=TargetType.RELEASE
             ),
         },
     )
     archive_data.snapshot_add([snapshot])
 
     snp_url = reverse(
         "browse-snapshot-directory", url_args={"snapshot_id": snapshot.id.hex()}
     )
     log_url = reverse(
         "browse-snapshot-log", url_args={"snapshot_id": snapshot.id.hex()}
     )
 
     resp = check_html_get_response(
-        client, snp_url, status_code=200, template_used="browse/directory.html"
+        client, snp_url, status_code=200, template_used="browse-directory.html"
     )
     assert_not_contains(resp, log_url)
 
     resp = check_html_get_response(
         client, log_url, status_code=404, template_used="error.html"
     )
     assert_contains(
         resp,
         "No revisions history found in the current snapshot context.",
         status_code=404,
     )
 
 
 @given(new_person(), new_swh_date())
 def test_browse_snapshot_log_when_revisions(
     client, archive_data, directory, person, date
 ):
 
     revision = Revision(
         directory=hash_to_bytes(directory),
         author=person,
         committer=person,
         message=b"commit message",
         date=TimestampWithTimezone.from_datetime(date),
         committer_date=TimestampWithTimezone.from_datetime(date),
         synthetic=False,
         type=RevisionType.GIT,
     )
     archive_data.revision_add([revision])
 
     snapshot = Snapshot(
         branches={
             b"HEAD": SnapshotBranch(
                 target=revision.id, target_type=TargetType.REVISION
             ),
         },
     )
     archive_data.snapshot_add([snapshot])
 
     snp_url = reverse(
         "browse-snapshot-directory", url_args={"snapshot_id": snapshot.id.hex()}
     )
     log_url = reverse(
         "browse-snapshot-log", url_args={"snapshot_id": snapshot.id.hex()}
     )
 
     resp = check_html_get_response(
-        client, snp_url, status_code=200, template_used="browse/directory.html"
+        client, snp_url, status_code=200, template_used="browse-directory.html"
     )
     assert_contains(resp, log_url)