diff --git a/src/Controller/LabelController.php b/src/Controller/LabelController.php
index 6b86d9d6..769639d4 100644
--- a/src/Controller/LabelController.php
+++ b/src/Controller/LabelController.php
@@ -146,7 +146,7 @@ class LabelController extends AbstractController
             }
         }
 
-        return $this->renderForm('LabelSystem/dialog.html.twig', [
+        return $this->renderForm('label_system/dialog.html.twig', [
             'form' => $form,
             'pdf_data' => $pdf_data,
             'filename' => $filename,
diff --git a/src/Controller/ScanController.php b/src/Controller/ScanController.php
index 639af0fc..8c0c9ad8 100644
--- a/src/Controller/ScanController.php
+++ b/src/Controller/ScanController.php
@@ -91,7 +91,7 @@ class ScanController extends AbstractController
             }
         }
 
-        return $this->renderForm('LabelSystem/Scanner/dialog.html.twig', [
+        return $this->renderForm('label_system/scanner/scanner.html.twig', [
             'form' => $form,
         ]);
     }
diff --git a/src/Services/LabelSystem/LabelHTMLGenerator.php b/src/Services/LabelSystem/LabelHTMLGenerator.php
index f869e134..f526ac9d 100644
--- a/src/Services/LabelSystem/LabelHTMLGenerator.php
+++ b/src/Services/LabelSystem/LabelHTMLGenerator.php
@@ -115,7 +115,7 @@ final class LabelHTMLGenerator
             ++$page;
         }
 
-        return $this->twig->render('LabelSystem/labels/base_label.html.twig', [
+        return $this->twig->render('label_system/labels/base_label.html.twig', [
             'meta_title' => $this->getPDFTitle($options, $elements[0]),
             'elements' => $twig_elements,
             'options' => $options,
diff --git a/templates/AdminPages/StorelocationAdmin.html.twig b/templates/AdminPages/StorelocationAdmin.html.twig
index 3bbeb1ae..e7d65753 100644
--- a/templates/AdminPages/StorelocationAdmin.html.twig
+++ b/templates/AdminPages/StorelocationAdmin.html.twig
@@ -1,5 +1,5 @@
 {% extends "AdminPages/EntityAdminBase.html.twig" %}
-{% import "LabelSystem/dropdown_macro.html.twig" as dropdown %}
+{% import "label_system/dropdown_macro.html.twig" as dropdown %}
 
 {% block card_title %}
     <i class="fas fa-cube fa-fw"></i> {% trans %}storelocation.labelp{% endtrans %}
diff --git a/templates/LabelSystem/dialog.html.twig b/templates/label_system/dialog.html.twig
similarity index 100%
rename from templates/LabelSystem/dialog.html.twig
rename to templates/label_system/dialog.html.twig
diff --git a/templates/LabelSystem/dropdown_macro.html.twig b/templates/label_system/dropdown_macro.html.twig
similarity index 100%
rename from templates/LabelSystem/dropdown_macro.html.twig
rename to templates/label_system/dropdown_macro.html.twig
diff --git a/templates/LabelSystem/labels/base_label.html.twig b/templates/label_system/labels/base_label.html.twig
similarity index 70%
rename from templates/LabelSystem/labels/base_label.html.twig
rename to templates/label_system/labels/base_label.html.twig
index d3c1b999..da6a3e5c 100644
--- a/templates/LabelSystem/labels/base_label.html.twig
+++ b/templates/label_system/labels/base_label.html.twig
@@ -7,7 +7,7 @@
     <meta name="description" content="Label for {{ meta_title }}">
     <meta name="keywords" content="Part-DB, Label, Barcode">
     <style>
-        {% include("LabelSystem/labels/label_style.css.twig") %}
+        {% include("label_system/labels/label_style.css.twig") %}
         {{ options.additionalCss | escape("html") }}
     </style>
 </head>
@@ -15,11 +15,11 @@
 {% for element in elements %}
     <div class="page">
         {% if options.barcodeType == 'none' %}
-            {% include "LabelSystem/labels/label_page_none.html.twig" %}
+            {% include "label_system/labels/label_page_none.html.twig" %}
         {% elseif options.barcodeType in ['qr', 'datamatrix'] %}
-            {% include "LabelSystem/labels/label_page_qr.html.twig" %}
+            {% include "label_system/labels/label_page_qr.html.twig" %}
         {% elseif options.barcodeType in ['code39', 'code93', 'code128'] %}
-            {% include "LabelSystem/labels/label_page_1d.html.twig" %}
+            {% include "label_system/labels/label_page_1d.html.twig" %}
         {% endif %}
     </div>
 {% endfor %}
diff --git a/templates/LabelSystem/labels/label_page_1d.html.twig b/templates/label_system/labels/label_page_1d.html.twig
similarity index 100%
rename from templates/LabelSystem/labels/label_page_1d.html.twig
rename to templates/label_system/labels/label_page_1d.html.twig
diff --git a/templates/LabelSystem/labels/label_page_none.html.twig b/templates/label_system/labels/label_page_none.html.twig
similarity index 100%
rename from templates/LabelSystem/labels/label_page_none.html.twig
rename to templates/label_system/labels/label_page_none.html.twig
diff --git a/templates/LabelSystem/labels/label_page_qr.html.twig b/templates/label_system/labels/label_page_qr.html.twig
similarity index 100%
rename from templates/LabelSystem/labels/label_page_qr.html.twig
rename to templates/label_system/labels/label_page_qr.html.twig
diff --git a/templates/LabelSystem/labels/label_style.css.twig b/templates/label_system/labels/label_style.css.twig
similarity index 100%
rename from templates/LabelSystem/labels/label_style.css.twig
rename to templates/label_system/labels/label_style.css.twig
diff --git a/templates/LabelSystem/Scanner/dialog.html.twig b/templates/label_system/scanner/scanner.html.twig
similarity index 100%
rename from templates/LabelSystem/Scanner/dialog.html.twig
rename to templates/label_system/scanner/scanner.html.twig
diff --git a/templates/parts/info/_part_lots.html.twig b/templates/parts/info/_part_lots.html.twig
index 08e5a660..ddf7d43d 100644
--- a/templates/parts/info/_part_lots.html.twig
+++ b/templates/parts/info/_part_lots.html.twig
@@ -1,5 +1,5 @@
 {% import "helper.twig" as helper %}
-{% import "LabelSystem/dropdown_macro.html.twig" as dropdown %}
+{% import "label_system/dropdown_macro.html.twig" as dropdown %}
 
 {% include "parts/info/_withdraw_modal.html.twig" %}
 
diff --git a/templates/parts/info/_tools.html.twig b/templates/parts/info/_tools.html.twig
index 2c76062b..6fee4aee 100644
--- a/templates/parts/info/_tools.html.twig
+++ b/templates/parts/info/_tools.html.twig
@@ -1,4 +1,4 @@
-{% import "LabelSystem/dropdown_macro.html.twig" as dropdown %}
+{% import "label_system/dropdown_macro.html.twig" as dropdown %}
 
 {% if is_granted('edit', part) %}
     <a href="{{ entity_url(part, 'edit') }}" class="btn btn-primary mt-3">
diff --git a/templates/parts/lists/_info_card.html.twig b/templates/parts/lists/_info_card.html.twig
index 581ac5f0..876bd31b 100644
--- a/templates/parts/lists/_info_card.html.twig
+++ b/templates/parts/lists/_info_card.html.twig
@@ -1,5 +1,5 @@
 {% import "helper.twig" as helper %}
-{% import "LabelSystem/dropdown_macro.html.twig" as dropdown %}
+{% import "label_system/dropdown_macro.html.twig" as dropdown %}
 
 {{ helper.breadcrumb_entity_link(entity) }}
 
diff --git a/templates/projects/info/_info_card.html.twig b/templates/projects/info/_info_card.html.twig
index 3e802b03..327f4eca 100644
--- a/templates/projects/info/_info_card.html.twig
+++ b/templates/projects/info/_info_card.html.twig
@@ -1,5 +1,5 @@
 {% import "helper.twig" as helper %}
-{% import "LabelSystem/dropdown_macro.html.twig" as dropdown %}
+{% import "label_system/dropdown_macro.html.twig" as dropdown %}
 
 {{ helper.breadcrumb_entity_link(project) }}