diff --git a/templates/forms/group.html.twig b/templates/forms/group.html.twig
index 999757c..c2f37b5 100644
--- a/templates/forms/group.html.twig
+++ b/templates/forms/group.html.twig
@@ -1,11 +1,11 @@
 {% extends "@admin/forms/group.html.twig" %}
 
 {% block group_form %}
-    {% include "forms/partials/input-group-name.html.twig" with { 'col_width': 'col-sm-12' } %}
+    {% include "forms/inputs/group-name.html.twig" with { 'col_width': 'col-sm-12' } %}
 
-    {% include "forms/partials/input-group-slug.html.twig" with { 'col_width': 'col-sm-12' } %}
+    {% include "forms/inputs/group-slug.html.twig" with { 'col_width': 'col-sm-12' } %}
 
-    {% include "forms/partials/input-group-icon.html.twig" with { 'col_width': 'col-sm-12' } %}
+    {% include "forms/inputs/group-icon.html.twig" with { 'col_width': 'col-sm-12' } %}
 
-    {% include "forms/partials/input-group-description.html.twig" with { 'col_width': 'col-sm-12' } %}
+    {% include "forms/inputs/group-description.html.twig" with { 'col_width': 'col-sm-12' } %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/forms/partials/abstract/input-description.html.twig b/templates/forms/inputs/abstract/description.html.twig
similarity index 100%
rename from templates/forms/partials/abstract/input-description.html.twig
rename to templates/forms/inputs/abstract/description.html.twig
diff --git a/templates/forms/partials/abstract/input-icon.html.twig b/templates/forms/inputs/abstract/icon.html.twig
similarity index 100%
rename from templates/forms/partials/abstract/input-icon.html.twig
rename to templates/forms/inputs/abstract/icon.html.twig
diff --git a/templates/forms/partials/abstract/input-name.html.twig b/templates/forms/inputs/abstract/name.html.twig
similarity index 100%
rename from templates/forms/partials/abstract/input-name.html.twig
rename to templates/forms/inputs/abstract/name.html.twig
diff --git a/templates/forms/partials/abstract/input-slug.html.twig b/templates/forms/inputs/abstract/slug.html.twig
similarity index 100%
rename from templates/forms/partials/abstract/input-slug.html.twig
rename to templates/forms/inputs/abstract/slug.html.twig
diff --git a/templates/forms/partials/input-group-description.html.twig b/templates/forms/inputs/group-description.html.twig
similarity index 70%
rename from templates/forms/partials/input-group-description.html.twig
rename to templates/forms/inputs/group-description.html.twig
index 5be96cf..6d712f0 100644
--- a/templates/forms/partials/input-group-description.html.twig
+++ b/templates/forms/inputs/group-description.html.twig
@@ -1,5 +1,5 @@
 {% block input_group_description %}
-{% include "forms/partials/abstract/input-description.html.twig" with
+{% include "forms/inputs/abstract/description.html.twig" with
     {
         "type" : "group",
         "current_value" : group.description,
diff --git a/templates/forms/partials/input-group-icon.html.twig b/templates/forms/inputs/group-icon.html.twig
similarity index 80%
rename from templates/forms/partials/input-group-icon.html.twig
rename to templates/forms/inputs/group-icon.html.twig
index cafbeed..53ec5fc 100644
--- a/templates/forms/partials/input-group-icon.html.twig
+++ b/templates/forms/inputs/group-icon.html.twig
@@ -1,5 +1,5 @@
 {% block input_group_icon %}
-{% include "forms/partials/abstract/input-icon.html.twig" with
+{% include "forms/inputs/abstract/icon.html.twig" with
     {
         "type" : "group",
         "current_value" : group.icon,
diff --git a/templates/forms/partials/input-group-name.html.twig b/templates/forms/inputs/group-name.html.twig
similarity index 80%
rename from templates/forms/partials/input-group-name.html.twig
rename to templates/forms/inputs/group-name.html.twig
index 2f810e6..776822a 100644
--- a/templates/forms/partials/input-group-name.html.twig
+++ b/templates/forms/inputs/group-name.html.twig
@@ -1,5 +1,5 @@
 {% block input_group_name %}
-{% include "forms/partials/abstract/input-name.html.twig" with
+{% include "forms/inputs/abstract/name.html.twig" with
     {
         "type" : "group",
         "current_value" : group.name,
diff --git a/templates/forms/partials/input-group-slug.html.twig b/templates/forms/inputs/group-slug.html.twig
similarity index 70%
rename from templates/forms/partials/input-group-slug.html.twig
rename to templates/forms/inputs/group-slug.html.twig
index c24f8fa..db51ccc 100644
--- a/templates/forms/partials/input-group-slug.html.twig
+++ b/templates/forms/inputs/group-slug.html.twig
@@ -1,5 +1,5 @@
 {% block input_group_slug %}
-{% include "forms/partials/abstract/input-slug.html.twig" with
+{% include "forms/inputs/abstract/slug.html.twig" with
     {
         "type" : "group",
         "current_value" : group.slug,
diff --git a/templates/forms/partials/input-role-description.html.twig b/templates/forms/inputs/role-description.html.twig
similarity index 70%
rename from templates/forms/partials/input-role-description.html.twig
rename to templates/forms/inputs/role-description.html.twig
index f521e5a..5fc215a 100644
--- a/templates/forms/partials/input-role-description.html.twig
+++ b/templates/forms/inputs/role-description.html.twig
@@ -1,5 +1,5 @@
 {% block input_role_description %}
-{% include "forms/partials/abstract/input-description.html.twig" with
+{% include "forms/inputs/abstract/description.html.twig" with
     {
         "type" : "role",
         "current_value" : role.description,
diff --git a/templates/forms/partials/input-role-name.html.twig b/templates/forms/inputs/role-name.html.twig
similarity index 76%
rename from templates/forms/partials/input-role-name.html.twig
rename to templates/forms/inputs/role-name.html.twig
index 022da9d..984acd6 100644
--- a/templates/forms/partials/input-role-name.html.twig
+++ b/templates/forms/inputs/role-name.html.twig
@@ -1,5 +1,5 @@
 {% block input_role_name %}
-{% include "forms/partials/abstract/input-name.html.twig" with
+{% include "forms/inputs/abstract/name.html.twig" with
     {
         "type" : "role",
         "current_value" : role.name,
diff --git a/templates/forms/partials/input-role-slug.html.twig b/templates/forms/inputs/role-slug.html.twig
similarity index 70%
rename from templates/forms/partials/input-role-slug.html.twig
rename to templates/forms/inputs/role-slug.html.twig
index c56a9f6..b1dd666 100644
--- a/templates/forms/partials/input-role-slug.html.twig
+++ b/templates/forms/inputs/role-slug.html.twig
@@ -1,5 +1,5 @@
 {% block input_role_slug %}
-{% include "forms/partials/abstract/input-slug.html.twig" with
+{% include "forms/inputs/abstract/slug.html.twig" with
     {
         "type" : "role",
         "current_value" : role.slug,
diff --git a/templates/forms/partials/input-user-current_password.html.twig b/templates/forms/inputs/user-current_password.html.twig
similarity index 100%
rename from templates/forms/partials/input-user-current_password.html.twig
rename to templates/forms/inputs/user-current_password.html.twig
diff --git a/templates/forms/partials/input-user-email.html.twig b/templates/forms/inputs/user-email.html.twig
similarity index 100%
rename from templates/forms/partials/input-user-email.html.twig
rename to templates/forms/inputs/user-email.html.twig
diff --git a/templates/forms/partials/input-user-first_name.html.twig b/templates/forms/inputs/user-first_name.html.twig
similarity index 100%
rename from templates/forms/partials/input-user-first_name.html.twig
rename to templates/forms/inputs/user-first_name.html.twig
diff --git a/templates/forms/partials/input-user-group.html.twig b/templates/forms/inputs/user-group.html.twig
similarity index 100%
rename from templates/forms/partials/input-user-group.html.twig
rename to templates/forms/inputs/user-group.html.twig
diff --git a/templates/forms/partials/input-user-last_name.html.twig b/templates/forms/inputs/user-last_name.html.twig
similarity index 100%
rename from templates/forms/partials/input-user-last_name.html.twig
rename to templates/forms/inputs/user-last_name.html.twig
diff --git a/templates/forms/partials/input-user-locale.html.twig b/templates/forms/inputs/user-locale.html.twig
similarity index 100%
rename from templates/forms/partials/input-user-locale.html.twig
rename to templates/forms/inputs/user-locale.html.twig
diff --git a/templates/forms/partials/input-user-name.html.twig b/templates/forms/inputs/user-name.html.twig
similarity index 52%
rename from templates/forms/partials/input-user-name.html.twig
rename to templates/forms/inputs/user-name.html.twig
index 0b469df..b7b1b6e 100644
--- a/templates/forms/partials/input-user-name.html.twig
+++ b/templates/forms/inputs/user-name.html.twig
@@ -2,8 +2,8 @@
 {% if 'name' not in form.fields.hidden %}
     {% if col_width %}<div class="{{col_width}}">{% endif %}
         <div class="row">
-            {% include "forms/partials/input-user-first_name.html.twig" with { 'col_width': 'col-sm-6' } %}
-            {% include "forms/partials/input-user-last_name.html.twig" with { 'col_width': 'col-sm-6' } %}
+            {% include "forms/inputs/user-first_name.html.twig" with { 'col_width': 'col-sm-6' } %}
+            {% include "forms/inputs/user-last_name.html.twig" with { 'col_width': 'col-sm-6' } %}
         </div>
     {% if col_width %}</div>{% endif %}
 {% endif %}
diff --git a/templates/forms/partials/input-user-new_password.html.twig b/templates/forms/inputs/user-new_password.html.twig
similarity index 100%
rename from templates/forms/partials/input-user-new_password.html.twig
rename to templates/forms/inputs/user-new_password.html.twig
diff --git a/templates/forms/partials/input-user-theme.html.twig b/templates/forms/inputs/user-theme.html.twig
similarity index 100%
rename from templates/forms/partials/input-user-theme.html.twig
rename to templates/forms/inputs/user-theme.html.twig
diff --git a/templates/forms/partials/input-user-user_name.html.twig b/templates/forms/inputs/user-user_name.html.twig
similarity index 100%
rename from templates/forms/partials/input-user-user_name.html.twig
rename to templates/forms/inputs/user-user_name.html.twig
diff --git a/templates/forms/role.html.twig b/templates/forms/role.html.twig
index b3cb00e..6adc274 100644
--- a/templates/forms/role.html.twig
+++ b/templates/forms/role.html.twig
@@ -4,11 +4,11 @@
     </div>
     <div class="row">
         {% block role_form %}
-            {% include "forms/partials/input-role-name.html.twig" with { 'col_width': 'col-sm-12' } %}
+            {% include "forms/inputs/role-name.html.twig" with { 'col_width': 'col-sm-12' } %}
 
-            {% include "forms/partials/input-role-slug.html.twig" with { 'col_width': 'col-sm-12' } %}
+            {% include "forms/inputs/role-slug.html.twig" with { 'col_width': 'col-sm-12' } %}
 
-            {% include "forms/partials/input-role-description.html.twig" with { 'col_width': 'col-sm-12' } %}
+            {% include "forms/inputs/role-description.html.twig" with { 'col_width': 'col-sm-12' } %}
         {% endblock %}
     </div><br>
     <div class="row">
diff --git a/templates/forms/settings-account.html.twig b/templates/forms/settings-account.html.twig
index fbd6006..6a7e494 100644
--- a/templates/forms/settings-account.html.twig
+++ b/templates/forms/settings-account.html.twig
@@ -10,11 +10,11 @@
 
         {% block settings_account %}
             <div class="row">
-                {% include "forms/partials/input-user-email.html.twig" with { 'col_width': 'col-sm-12' } %}
+                {% include "forms/inputs/user-email.html.twig" with { 'col_width': 'col-sm-12' } %}
             </div>
 
             <div class="row">
-                {% include "forms/partials/input-user-new_password.html.twig" with { 'col_width': 'col-sm-12' } %}
+                {% include "forms/inputs/user-new_password.html.twig" with { 'col_width': 'col-sm-12' } %}
             </div>
             
             {% if 'password' not in form.fields.hidden %}
@@ -22,7 +22,7 @@
             {% endif %}
 
             <div class="row">
-                {% include "forms/partials/input-user-current_password.html.twig" with { 'col_width': 'col-sm-12' } %}
+                {% include "forms/inputs/user-current_password.html.twig" with { 'col_width': 'col-sm-12' } %}
             </div>
         {% endblock %}
     </div>
diff --git a/templates/forms/settings-profile.html.twig b/templates/forms/settings-profile.html.twig
index cc8cc72..869e86e 100644
--- a/templates/forms/settings-profile.html.twig
+++ b/templates/forms/settings-profile.html.twig
@@ -7,11 +7,11 @@
 
         {% block settings_profile %}
             <div class="row">
-                {% include "forms/partials/input-user-name.html.twig" with { 'col_width': 'col-sm-12' } %}
+                {% include "forms/inputs/user-name.html.twig" with { 'col_width': 'col-sm-12' } %}
             </div>
 
             <div class="row">
-                {% include "forms/partials/input-user-locale.html.twig" with { 'col_width': 'col-sm-12' } %}
+                {% include "forms/inputs/user-locale.html.twig" with { 'col_width': 'col-sm-12' } %}
             </div>
         {% endblock %}
     </div>
diff --git a/templates/forms/user.html.twig b/templates/forms/user.html.twig
index e937e85..78f0c42 100644
--- a/templates/forms/user.html.twig
+++ b/templates/forms/user.html.twig
@@ -1,17 +1,17 @@
 {% extends "@admin/forms/user.html.twig" %}
 
 {% block user_form %}
-    {% include "forms/partials/input-user-user_name.html.twig" with { 'col_width': 'col-sm-6' } %}
+    {% include "forms/inputs/user-user_name.html.twig" with { 'col_width': 'col-sm-6' } %}
 
-    {% include "forms/partials/input-user-group.html.twig" with { 'col_width': 'col-sm-6' } %}
+    {% include "forms/inputs/user-group.html.twig" with { 'col_width': 'col-sm-6' } %}
 
-    {% include "forms/partials/input-user-name.html.twig" with { 'col_width': 'col-sm-12' } %}
+    {% include "forms/inputs/user-name.html.twig" with { 'col_width': 'col-sm-12' } %}
 
-    {% include "forms/partials/input-user-email.html.twig" with { 'col_width': 'col-sm-6' } %}
+    {% include "forms/inputs/user-email.html.twig" with { 'col_width': 'col-sm-6' } %}
 
-    {% include "forms/partials/input-user-theme.html.twig" with { 'col_width': 'col-sm-6' } %}
+    {% include "forms/inputs/user-theme.html.twig" with { 'col_width': 'col-sm-6' } %}
 
-    {% include "forms/partials/input-user-locale.html.twig" with { 'col_width': 'col-sm-6' } %}
+    {% include "forms/inputs/user-locale.html.twig" with { 'col_width': 'col-sm-6' } %}
 
     {% if 'password' not in form.fields.hidden %}
         {% include "forms/partials/user-set-password.html.twig" %}