diff --git a/device/templates/details.html b/device/templates/details.html
index 07cb2aa..4e0d410 100644
--- a/device/templates/details.html
+++ b/device/templates/details.html
@@ -15,7 +15,7 @@
           <a href="#details" class="nav-link active" data-bs-toggle="tab" data-bs-target="#details">{% trans 'General details' %}</a>
         </li>
         <li class="nav-item">
-          <a href="#annotations" class="nav-link" data-bs-toggle="tab" data-bs-target="#annotations">{% trans 'User properties' %}</a>
+          <a href="#user_properties" class="nav-link" data-bs-toggle="tab" data-bs-target="#user_properties">{% trans 'User properties' %}</a>
         </li>
         <li class="nav-item">
           <a href="#documents" class="nav-link" data-bs-toggle="tab" data-bs-target="#documents">{% trans 'Documents' %}</a>
@@ -112,7 +112,7 @@
       {% endfor %}
     </div>
 
-    <div class="tab-pane fade" id="annotations">
+    <div class="tab-pane fade" id="user_properties">
       <div class="btn-group mt-1 mb-3">
         <a href="{% url 'device:add_user_property' object.pk %}" class="btn btn-primary">
           <i class="bi bi-plus"></i>
diff --git a/evidence/templates/ev_details.html b/evidence/templates/ev_details.html
index 563ca92..0e66042 100644
--- a/evidence/templates/ev_details.html
+++ b/evidence/templates/ev_details.html
@@ -45,7 +45,7 @@
             </th>
           </tr>
         </thead>
-        {% for snap in object.annotations %}
+        {% for snap in object.properties %}
         <tbody>
         {% if snap.type == 0 %}
           <tr>
@@ -94,7 +94,7 @@
 	    </div>
 	    {% if form.tag.value %}
 	    <div class="col-1">
-	      <a class="btn btn-yellow" href="{% url 'evidence:delete_annotation' form.pk %}">{% translate "Delete" %}</a>
+	      <a class="btn btn-yellow" href="{% url 'evidence:delete_user_property' form.pk %}">{% translate "Delete" %}</a>
 	    </div>
 	    {% endif %}
 	  </div>