diff --git a/src/fellchensammlung/templates/fellchensammlung/footer.html b/src/fellchensammlung/templates/fellchensammlung/footer.html
index 110e30e..1ba0497 100644
--- a/src/fellchensammlung/templates/fellchensammlung/footer.html
+++ b/src/fellchensammlung/templates/fellchensammlung/footer.html
@@ -19,7 +19,7 @@
                 <h3 class="bd-footer-title title is-5">
                     {% trans 'Sprache ändern' %}
                 </h3>
-                {% include "fellchensammlung/forms/change_language.html" %}
+                {% include "fellchensammlung/forms/form_change_language.html" %}
             </div>
 
         </div>
diff --git a/src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-add-adoption.html b/src/fellchensammlung/templates/fellchensammlung/forms/form-add-adoption.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-add-adoption.html
rename to src/fellchensammlung/templates/fellchensammlung/forms/form-add-adoption.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/forms/form_add_animal_to_adoption.html b/src/fellchensammlung/templates/fellchensammlung/forms/form-add-animal-to-adoption.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/forms/form_add_animal_to_adoption.html
rename to src/fellchensammlung/templates/fellchensammlung/forms/form-add-animal-to-adoption.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-comment.html b/src/fellchensammlung/templates/fellchensammlung/forms/form-comment.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-comment.html
rename to src/fellchensammlung/templates/fellchensammlung/forms/form-comment.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-image.html b/src/fellchensammlung/templates/fellchensammlung/forms/form-image.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/forms/bulma-form-image.html
rename to src/fellchensammlung/templates/fellchensammlung/forms/form-image.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/forms/change_language.html b/src/fellchensammlung/templates/fellchensammlung/forms/form_change_language.html
similarity index 100%
rename from src/fellchensammlung/templates/fellchensammlung/forms/change_language.html
rename to src/fellchensammlung/templates/fellchensammlung/forms/form_change_language.html
diff --git a/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html b/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html
index 08c8f67..a1cd704 100644
--- a/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html
+++ b/src/fellchensammlung/templates/fellchensammlung/partials/partial-comment-section.html
@@ -16,7 +16,7 @@
 </div>
 <div class="block">
     {% if user.is_authenticated %}
-        {% include "fellchensammlung/forms/bulma-form-comment.html" %}
+        {% include "fellchensammlung/forms/form-comment.html" %}
     {% else %}
         <p class="card-footer-item">
             {% translate 'Du musst dich einloggen um Kommentare zu hinterlassen' %}
diff --git a/src/fellchensammlung/views.py b/src/fellchensammlung/views.py
index 972a0ac..5a0bd64 100644
--- a/src/fellchensammlung/views.py
+++ b/src/fellchensammlung/views.py
@@ -270,7 +270,7 @@ def add_adoption_notice_bulma(request):
             print(form.errors)
     else:
         form = AdoptionNoticeFormAutoAnimal()
-    return render(request, 'fellchensammlung/forms/bulma-form-add-adoption.html', {'form': form})
+    return render(request, 'fellchensammlung/forms/form-add-adoption.html', {'form': form})
 
 
 @login_required
@@ -289,12 +289,12 @@ def adoption_notice_add_animal(request, adoption_notice_id):
             form.save_m2m()
             if "save-and-add-another-animal" in request.POST:
                 form = AnimalForm()
-                return render(request, 'fellchensammlung/forms/form_add_animal_to_adoption.html', {'form': form})
+                return render(request, 'fellchensammlung/forms/form-add-animal-to-adoption.html', {'form': form})
             else:
                 return redirect(reverse("adoption-notice-detail", args=[adoption_notice_id]))
     else:
         form = AnimalForm()
-    return render(request, 'fellchensammlung/forms/form_add_animal_to_adoption.html', {'form': form})
+    return render(request, 'fellchensammlung/forms/form-add-animal-to-adoption.html', {'form': form})
 
 
 @login_required
@@ -318,15 +318,15 @@ def add_photo_to_animal_bulma(request, animal_id):
 
             if "save-and-add-another" in request.POST:
                 form = ImageForm(in_flow=True)
-                return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form})
+                return render(request, 'fellchensammlung/forms/form-image.html', {'form': form})
             else:
                 return redirect(reverse("adoption-notice-detail", args=[animal.adoption_notice.pk], ))
         else:
-            return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form})
+            return render(request, 'fellchensammlung/forms/form-image.html', {'form': form})
 
     else:
         form = ImageForm(in_flow=True)
-        return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form})
+        return render(request, 'fellchensammlung/forms/form-image.html', {'form': form})
 
 
 @login_required
@@ -347,14 +347,14 @@ def add_photo_to_adoption_notice_bulma(request, adoption_notice_id):
                                text=f"{request.user} hat Foto {instance.pk} zur Vermittlung {adoption_notice.pk} hinzugefügt")
             if "save-and-add-another" in request.POST:
                 form = ImageForm(in_flow=True)
-                return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form})
+                return render(request, 'fellchensammlung/forms/form-image.html', {'form': form})
             else:
                 return redirect(reverse("adoption-notice-detail", args=[adoption_notice_id]))
         else:
-            return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form})
+            return render(request, 'fellchensammlung/forms/form-image.html', {'form': form})
     else:
         form = ImageForm(in_flow=True)
-        return render(request, 'fellchensammlung/forms/bulma-form-image.html', {'form': form})
+        return render(request, 'fellchensammlung/forms/form-image.html', {'form': form})
 
 
 @login_required