diff --git a/device/templates/details.html b/device/templates/details.html
index 137a4f6..3669679 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 annotations' %}</a>
+          <a href="#annotations" class="nav-link" data-bs-toggle="tab" data-bs-target="#annotations">{% 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>
@@ -102,13 +102,13 @@
 
     <div class="tab-pane fade" id="annotations">
       <div class="btn-group mt-1 mb-3">
-        <a href="{% url 'device:add_annotation' object.pk %}" class="btn btn-primary">
+        <a href="{% url 'device:add_user_property' object.pk %}" class="btn btn-primary">
           <i class="bi bi-plus"></i>
-          {% trans 'Add new annotation' %}
+          {% trans 'New user property' %}
         </a>
       </div>
 
-      <h5 class="card-title">{% trans 'Annotations' %}</h5>
+      <h5 class="card-title">{% trans 'User properties' %}</h5>
       <table class="table table-striped">
         <thead>
           <tr>
diff --git a/device/templates/new_annotation.html b/device/templates/new_user_property.html
similarity index 100%
rename from device/templates/new_annotation.html
rename to device/templates/new_user_property.html
diff --git a/device/urls.py b/device/urls.py
index a56aa29..05a2988 100644
--- a/device/urls.py
+++ b/device/urls.py
@@ -7,7 +7,7 @@ urlpatterns = [
     path("add/", views.NewDeviceView.as_view(), name="add"),
     path("edit/<str:pk>/", views.EditDeviceView.as_view(), name="edit"),
     path("<str:pk>/", views.DetailsView.as_view(), name="details"),
-    path("<str:pk>/annotation/add", views.AddAnnotationView.as_view(), name="add_annotation"),
+    path("<str:pk>/user_property/add", views.AddUserPropertyView.as_view(), name="add_user_property"),
     path("<str:pk>/document/add", views.AddDocumentView.as_view(), name="add_document"),
     path("<str:pk>/public/", views.PublicDeviceWebView.as_view(), name="device_web"),
 
diff --git a/device/views.py b/device/views.py
index 319f8cf..ce55c26 100644
--- a/device/views.py
+++ b/device/views.py
@@ -167,10 +167,10 @@ class PublicDeviceWebView(TemplateView):
         return JsonResponse(device_data)
 
 
-class AddAnnotationView(DashboardView, CreateView):
-    template_name = "new_annotation.html"
-    title = _("New annotation")
-    breadcrumb = "Device / New annotation"
+class AddUserPropertyView(DashboardView, CreateView):
+    template_name = "new_user_property.html"
+    title = _("New User Property")
+    breadcrumb = "Device / New Property"
     success_url = reverse_lazy('dashboard:unassigned_devices')
     model = Annotation
     fields = ("key", "value")