diff --git a/src/Field/Render/FieldRenderer.php b/src/Field/Render/FieldRenderer.php
index 739441827..ecbbaa6e9 100644
--- a/src/Field/Render/FieldRenderer.php
+++ b/src/Field/Render/FieldRenderer.php
@@ -65,7 +65,7 @@ public function renderHeader(ViewInterface $admin, FieldInterface $field): strin
             $key = TranslationUtils::getTranslationKey(
                 $configuration->get('translation_pattern'),
                 $admin->getName(),
-                $field->getName()
+                StringUtils::underscore($field->getName())
             );
             $title = $this->translator->trans($key);
         } else {
diff --git a/src/Resources/views/CRUD/edit.html.twig b/src/Resources/views/CRUD/edit.html.twig
index bfe4e9cad..eeeebba89 100644
--- a/src/Resources/views/CRUD/edit.html.twig
+++ b/src/Resources/views/CRUD/edit.html.twig
@@ -7,6 +7,8 @@
     {% form_theme form 'bootstrap_4_layout.html.twig' %}
 
     {% block form %}
+        {# TODO use the form start/end helper #}
+{#        {{ form_start() }}#}
         <form action=""
               method="post"
               role="form"