diff --git a/beat/web/databases/templates/databases/view.html b/beat/web/databases/templates/databases/view.html
index 005007b431e86e6809155adcca699eb9dec7fc81..688b77cb07775e18e67f336f77a46df9a7cfb4d2 100644
--- a/beat/web/databases/templates/databases/view.html
+++ b/beat/web/databases/templates/databases/view.html
@@ -2,21 +2,21 @@
 {% comment %}
  * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
  * Contact: beat.support@idiap.ch
- * 
+ *
  * This file is part of the beat.web module of the BEAT platform.
- * 
+ *
  * Commercial License Usage
  * Licensees holding valid commercial BEAT licenses may use this file in
  * accordance with the terms contained in a written agreement between you
  * and Idiap. For further information contact tto@idiap.ch
- * 
+ *
  * Alternatively, this file may be used under the terms of the GNU Affero
  * Public License version 3 as published by the Free Software and appearing
  * in the file LICENSE.AGPL included in the packaging of this file.
  * The BEAT platform is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  * or FITNESS FOR A PARTICULAR PURPOSE.
- * 
+ *
  * You should have received a copy of the GNU Affero Public License along
  * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
 {% endcomment %}
@@ -80,7 +80,7 @@
 
     <ul id="object-tabs" class="nav nav-tabs" role="tablist">
       <li role="presentation" class="active"><a {% if not database.description %}title="No documentation available" {% endif %} href="#doc" role="tab" data-toggle="tab" aria-controls="doc">Documentation{% if not database.description %} <i class="fa fa-warning"></i>{% endif %}</a></li>
-      <li role="presentation"><a href="#protocols" role="tab" data-toggle="tab" aria-controls="protocols">Protocols <span class="badge">{{ database.protocols.count }}</span></a></li>
+      <li role="presentation"><a href="#protos" role="tab" data-toggle="tab" aria-controls="protos">Protocols <span class="badge">{{ database.protocols.count }}</span></a></li>
       <li role="presentation"><a href="#sharing" role="tab" data-toggle="tab" aria-controls="sharing">Sharing</a></li>
     </ul>
 
@@ -92,11 +92,11 @@
         {% endif %}
       </div>
 
-      <div role="tabpanel" class="tab-pane" id="protocols">
+      <div role="tabpanel" class="tab-pane" id="protos">
         <div class="panel-group" id="protocol-accordion" role="tablist" aria-multiselectable="true">
 
           {% for protocol in database.protocols.all %}
-          {% with protocol.set_template_basename as name %}
+          {% with protocol.name as name %}
           <div class="panel panel-default">
             <div class="panel-heading" role="tab" id="heading_{{ name }}">
               <h4 class="panel-title">