diff --git a/src/Modules/Backend/templates/Backend/Actions/UserAdd.html.twig b/src/Modules/Backend/templates/Backend/Actions/UserAdd.html.twig
index c0c22480aa..deb3fb34d8 100644
--- a/src/Modules/Backend/templates/Backend/Actions/UserAdd.html.twig
+++ b/src/Modules/Backend/templates/Backend/Actions/UserAdd.html.twig
@@ -1,2 +1,2 @@
{% extends '@Backend/base/crud/add.html.twig' %}
-{% set crudIndexAction = 'UserIndex' %}
+{% set crud_index_action = 'UserIndex' %}
diff --git a/src/Modules/Backend/templates/Backend/Actions/UserEdit.html.twig b/src/Modules/Backend/templates/Backend/Actions/UserEdit.html.twig
index b0ff67fa8b..fed5deb5a4 100644
--- a/src/Modules/Backend/templates/Backend/Actions/UserEdit.html.twig
+++ b/src/Modules/Backend/templates/Backend/Actions/UserEdit.html.twig
@@ -1,5 +1,5 @@
{% extends '@Backend/base/crud/edit.html.twig' %}
-{% set crudIndexAction = 'UserIndex' %}
+{% set crud_index_action = 'UserIndex' %}
{% block content %}
@@ -48,5 +48,5 @@
- {{ parent()}}
+ {{ parent() }}
{% endblock %}
diff --git a/src/Modules/Backend/templates/Backend/Actions/UserGroupAdd.html.twig b/src/Modules/Backend/templates/Backend/Actions/UserGroupAdd.html.twig
index d1818d9cf4..4a028c8400 100644
--- a/src/Modules/Backend/templates/Backend/Actions/UserGroupAdd.html.twig
+++ b/src/Modules/Backend/templates/Backend/Actions/UserGroupAdd.html.twig
@@ -1,2 +1,2 @@
{% extends '@Backend/base/crud/add.html.twig' %}
-{% set crudIndexAction = 'UserGroupIndex' %}
+{% set crud_index_action = 'UserGroupIndex' %}
diff --git a/src/Modules/Backend/templates/Backend/Actions/UserGroupEdit.html.twig b/src/Modules/Backend/templates/Backend/Actions/UserGroupEdit.html.twig
index c3466c075b..0a73db88c9 100644
--- a/src/Modules/Backend/templates/Backend/Actions/UserGroupEdit.html.twig
+++ b/src/Modules/Backend/templates/Backend/Actions/UserGroupEdit.html.twig
@@ -1,2 +1,2 @@
{% extends '@Backend/base/crud/edit.html.twig' %}
-{% set crudIndexAction = 'UserGroupIndex' %}
+{% set crud_index_action = 'UserGroupIndex' %}
diff --git a/src/Modules/Backend/templates/Backend/Actions/UserGroupIndex.html.twig b/src/Modules/Backend/templates/Backend/Actions/UserGroupIndex.html.twig
index 5f896f20d2..6f518478b2 100644
--- a/src/Modules/Backend/templates/Backend/Actions/UserGroupIndex.html.twig
+++ b/src/Modules/Backend/templates/Backend/Actions/UserGroupIndex.html.twig
@@ -1,2 +1,2 @@
{% extends '@Backend/base/crud/index.html.twig' %}
-{% set crudActionName = 'UserGroupAdd' %}
+{% set crud_action_name = 'UserGroupAdd' %}
diff --git a/src/Modules/Backend/templates/Backend/Actions/UserIndex.html.twig b/src/Modules/Backend/templates/Backend/Actions/UserIndex.html.twig
index 59c3b04d49..e194aa577c 100644
--- a/src/Modules/Backend/templates/Backend/Actions/UserIndex.html.twig
+++ b/src/Modules/Backend/templates/Backend/Actions/UserIndex.html.twig
@@ -1,2 +1,2 @@
{% extends '@Backend/base/crud/index.html.twig' %}
-{% set crudActionName = 'UserAdd' %}
+{% set crud_action_name = 'UserAdd' %}
diff --git a/src/Modules/Backend/templates/Backend/login.html.twig b/src/Modules/Backend/templates/Backend/login.html.twig
index d81ba75a28..cc10582b3c 100644
--- a/src/Modules/Backend/templates/Backend/login.html.twig
+++ b/src/Modules/Backend/templates/Backend/login.html.twig
@@ -62,13 +62,12 @@
- {{ macro.buttonIcon('', 'sign-in-alt', 'lbl.LogIn'|trans|ucfirst, 'btn-primary', {"name":"login", "type":"submit"}) }}
+ {{ macro.buttonIcon('', 'sign-in-alt', 'lbl.LogIn'|trans|ucfirst, 'btn-primary', {"name": "login", "type": "submit"}) }}
{% endif %}
-
diff --git a/src/Modules/Backend/templates/base/base.html.twig b/src/Modules/Backend/templates/base/base.html.twig
index 0913837011..71dadd8ed9 100644
--- a/src/Modules/Backend/templates/base/base.html.twig
+++ b/src/Modules/Backend/templates/base/base.html.twig
@@ -8,15 +8,15 @@
{% include "@Backend/base/header.html.twig" %}
-