diff --git a/bird/templates/bird/bird_all.html b/bird/templates/bird/bird_all.html
index 24dfc89..06469cf 100644
--- a/bird/templates/bird/bird_all.html
+++ b/bird/templates/bird/bird_all.html
@@ -46,7 +46,7 @@
     <tr>
       <th>Patienten Alias</th>
       <th>Vogel</th>
-      <th>Retter</th>
+      <th>Finder</th>
       <th>Fundort</th>
       <th>gefunden am</th>
       <th>Status</th>
@@ -77,16 +77,16 @@
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header bg-primary">
-        <h5 class="modal-title text-white" id="addRescuerModalLabel">(neuen) Retter zuweisen</h5>
+        <h5 class="modal-title text-white" id="addRescuerModalLabel">(neuen) Finder zuweisen</h5>
       </div>
       <form method="post">
         {% csrf_token %}
         <div class="modal-body">
           <label for="rescuer" class="form-label mt-3">Wählen Sie einen <strong>bereits angelegten</strong>
-            Retter aus oder legen Sie einen <strong>neuen</strong> Retter an:</label>
+            Finder aus oder legen Sie einen <strong>neuen</strong> Finder an:</label>
           <select id="rescuer" class="form-select" name="rescuer_id">
             <option value="new_rescuer"><strong>neuen
-                Retter anlegen</strong></option>
+                Finder anlegen</strong></option>
             {% for rescuer in rescuer_modal %}
             <option value={{rescuer.id}}>
               {{rescuer.first_name}} {{rescuer.last_name}},
diff --git a/bird/templates/bird/bird_create.html b/bird/templates/bird/bird_create.html
index 433542f..52fe478 100644
--- a/bird/templates/bird/bird_create.html
+++ b/bird/templates/bird/bird_create.html
@@ -4,7 +4,7 @@
 {% block content %}
 
 <h3>Patient anlegen</h3>
-<p>(Retter: {{rescuer.first_name}} {{rescuer.last_name}})</p>
+<p>(Finder: {{rescuer.first_name}} {{rescuer.last_name}})</p>
 <div class="row">
   <div class="col-lg-8 mb-3">
     <form method="post" enctype="multipart/form-data">
diff --git a/bird/templates/bird/bird_single.html b/bird/templates/bird/bird_single.html
index 66a974e..593e0ed 100644
--- a/bird/templates/bird/bird_single.html
+++ b/bird/templates/bird/bird_single.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 {% block content %}
 <h3>Patient <strong>{{ bird.bird_identifier }}</strong> bearbeiten </h3>
-<p>Retter des Patienten: <strong> <a href="{% url 'rescuer_single' bird.rescuer_id %}">{{ bird.rescuer }}</a></strong></p>
+<p>Finder des Patienten: <strong> <a href="{% url 'rescuer_single' bird.rescuer_id %}">{{ bird.rescuer }}</a></strong></p>
 <div class="row">
     <div class="col-lg-5 mb-3">
         <form method="post" enctype="multipart/form-data">
diff --git a/rescuer/templates/rescuer/rescuer_all.html b/rescuer/templates/rescuer/rescuer_all.html
index 7961cc4..2468909 100644
--- a/rescuer/templates/rescuer/rescuer_all.html
+++ b/rescuer/templates/rescuer/rescuer_all.html
@@ -32,12 +32,12 @@
 
 {% endblock header %}
 {% block content %}
-<h3>Übersicht aller Retter</h3>
+<h3>Übersicht aller Finder</h3>
 <p>
-    Die Übersicht aller aktiven Retter.
+    Die Übersicht aller aktiven Finder.
 </p>
 <p>
-    <a href="{% url 'rescuer_create' %}" class="btn btn-primary">Einen neuen Retter anlegen</a>
+    <a href="{% url 'rescuer_create' %}" class="btn btn-primary">Einen neuen Finder anlegen</a>
 </p>
 
 <table class="table table-striped table-hover display responsive nowrap" width="100%" id="t__rescuer_all">
diff --git a/rescuer/templates/rescuer/rescuer_create.html b/rescuer/templates/rescuer/rescuer_create.html
index dd9b848..52d2e90 100644
--- a/rescuer/templates/rescuer/rescuer_create.html
+++ b/rescuer/templates/rescuer/rescuer_create.html
@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 {% load crispy_forms_tags %}
 {% block content %}
-<h4>Einen neuen Retter anlegen</h4>
+<h4>Einen neuen Finder anlegen</h4>
 <div class="row">
     <div class="col-lg-6">
         <form method="post" class="form-horizontal">
diff --git a/rescuer/templates/rescuer/rescuer_delete.html b/rescuer/templates/rescuer/rescuer_delete.html
index 6a436f7..44b66bc 100644
--- a/rescuer/templates/rescuer/rescuer_delete.html
+++ b/rescuer/templates/rescuer/rescuer_delete.html
@@ -1,14 +1,14 @@
 {% extends 'base.html' %}
 
 {% block content %}
-<h1>Retter löschen</h1>
+<h1>Finder löschen</h1>
 <div class="row mt-3">
     <div class="col-lg-7">
         <form method="post">
             {% csrf_token %}
             <div class="alert alert-dismissible alert-danger">
                 <h4 class="alert-heading">Warnung!</h4>
-                <p class="mb-0">Wollen Sie den Retter <strong>{{rescuer.first_name}} {{rescuer.last_name}}</strong> löschen?</p>
+                <p class="mb-0">Wollen Sie den Finder <strong>{{rescuer.first_name}} {{rescuer.last_name}}</strong> löschen?</p>
             </div>
             </p>
             <a href="{% url 'rescuer_all'%}" class="btn btn-secondary">Abbruch</a>
@@ -16,7 +16,7 @@
         </form>
     </div>
     <div class="col-lg-5">
-        <h5>Retter löschen</h5>
+        <h5>Finder löschen</h5>
         <p>
           Lorem ipsum, dolor sit amet consectetur adipisicing elit. Voluptates
           ducimus inventore quia, quae quam reiciendis eligendi explicabo non
diff --git a/rescuer/templates/rescuer/rescuer_edit.html b/rescuer/templates/rescuer/rescuer_edit.html
index 9c8f0fa..060ed76 100644
--- a/rescuer/templates/rescuer/rescuer_edit.html
+++ b/rescuer/templates/rescuer/rescuer_edit.html
@@ -3,7 +3,7 @@
 {% block content %}
 <div class="row">
   <div class="col-lg-7">
-    <h3>Adressänderung des Retters</h3>
+    <h3>Adressänderung des Finders</h3>
     <form method="post" class="form-horizontal">
       <fieldset>
         {% csrf_token %}
diff --git a/rescuer/templates/rescuer/rescuer_single.html b/rescuer/templates/rescuer/rescuer_single.html
index 649a7b8..40c6190 100644
--- a/rescuer/templates/rescuer/rescuer_single.html
+++ b/rescuer/templates/rescuer/rescuer_single.html
@@ -4,7 +4,7 @@
 
 <div class="row">
     <div class="col-lg-6">
-        <h3>Stammdaten des Retters</h3>
+        <h3>Stammdaten des Finders</h3>
         <div class="card bg-light mb-3" style="max-width: 30rem;">
             <div class="card-header">Adressdaten</div>
             <div class="card-body">
diff --git a/templates/partials/_navbar.html b/templates/partials/_navbar.html
index cc21879..f7f504b 100644
--- a/templates/partials/_navbar.html
+++ b/templates/partials/_navbar.html
@@ -20,7 +20,7 @@
                 </li>
                 <li class="nav-item">
                     <a class="nav-link {% if '/rescuer/all' in request.path %} active {% endif %}"
-                        href="{% url 'rescuer_all' %}">alle Retter</a>
+                        href="{% url 'rescuer_all' %}">alle Finder</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link {% if '/aviary/all' in request.path %} active {% endif %}"