diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
index e3f6687fd..bfdd87dc3 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/delete.html.twig
@@ -30,7 +30,7 @@
     </dl>
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 {{ include('@ChillMain/Util/confirmation_template.html.twig',
     {
         'title'             : 'Delete document ?'|trans,
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
index e64d76362..2c36ae141 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
@@ -14,7 +14,7 @@
     {{ encore_entry_link_tags('mod_pickentity_type') }}
 {% endblock %}
 
-{% block personcontent %}
+{% block content %}
 
 <h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
 
@@ -22,4 +22,4 @@
         <h3 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h3>
         {% include "@ChillPerson/PersonResource/form.html.twig" %}
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig
index 8b3bee29f..042deb1e2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/edit.html.twig
@@ -7,7 +7,6 @@
 {% block content %}
 <div class="address-edit">
 
-    {% block content %}
         <h1>{{ block('title') }}</h1>
 
         {{ form_start(form) }}
@@ -45,7 +44,6 @@
 
         {{ form_end(form) }}
 
-    {% endblock %}
 
 </div>
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig
index 8625d3051..5edbbb995 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/new.html.twig
@@ -7,7 +7,6 @@
 {% block content %}
 <div class="address-new">
 
-    {% block content %}
         <h1>{{ block('title') }}</h1>
 
         {# TODO #}
@@ -15,8 +14,6 @@
             {% include '@ChillPerson/ResidentialAddress/_form.html.twig' %}
         {% endblock %}
 
-    {% endblock %}
-
 </div>
 {% endblock %}