diff --git a/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php b/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
index d1393eafb..b6ebcf347 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
@@ -12,12 +12,17 @@ declare(strict_types=1);
 namespace Chill\BudgetBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Type of charge.
  *
- * @ORM\Table(name="chill_budget.charge_type")
+ * @ORM\Table(name="chill_budget.charge_type",
+ *     uniqueConstraints={@ORM\UniqueConstraint(name="charge_kind_unique_type_idx", fields={"kind"})}
+ * )
  * @ORM\Entity
+ * @UniqueEntity(fields={"kind"})
  */
 class ChargeKind
 {
@@ -35,6 +40,8 @@ class ChargeKind
 
     /**
      * @ORM\Column(type="string", length=255, options={"default": ""}, nullable=false)
+     * @Assert\Regex(pattern="/^[a-z0-9\-_]{1,}$/", message="budget.admin.form.kind.only_alphanumeric")
+     * @Assert\Length(min=3)
      */
     private string $kind = '';
 
diff --git a/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php b/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
index 5d88af298..4b90be5e1 100644
--- a/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
+++ b/src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
@@ -12,12 +12,17 @@ declare(strict_types=1);
 namespace Chill\BudgetBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * Type of resource.
  *
- * @ORM\Table(name="chill_budget.resource_type")
+ * @ORM\Table(name="chill_budget.resource_type", uniqueConstraints={
+ *     @ORM\UniqueConstraint(name="resource_kind_unique_type_idx", fields={"kind"})
+ * })
  * @ORM\Entity
+ * @UniqueEntity(fields={"kind"})
  */
 class ResourceKind
 {
@@ -35,6 +40,8 @@ class ResourceKind
 
     /**
      * @ORM\Column(type="string", length=255, nullable=false, options={"default": ""})
+     * @Assert\Regex(pattern="/^[a-z0-9\-_]{1,}$/", message="budget.admin.form.kind.only_alphanumeric")
+     * @Assert\Length(min=3)
      */
     private string $kind = '';
 
diff --git a/src/Bundle/ChillBudgetBundle/Form/Admin/ChargeKindType.php b/src/Bundle/ChillBudgetBundle/Form/Admin/ChargeKindType.php
index 661199aec..59adf49af 100644
--- a/src/Bundle/ChillBudgetBundle/Form/Admin/ChargeKindType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/Admin/ChargeKindType.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -25,7 +26,11 @@ class ChargeKindType extends AbstractType
     {
         $builder
             ->add('name', TranslatableStringFormType::class, [
-                'label' => 'Nom',
+                'label' => 'Title',
+            ])
+            ->add('kind', TextType::class, [
+                'label' => 'budget.admin.form.Charge_kind_key',
+                'help' => 'budget.admin.form.This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document'
             ])
             ->add('ordering', NumberType::class)
             ->add('isActive', CheckboxType::class, [
diff --git a/src/Bundle/ChillBudgetBundle/Form/Admin/ResourceKindType.php b/src/Bundle/ChillBudgetBundle/Form/Admin/ResourceKindType.php
index 7b2622c5d..0605b8731 100644
--- a/src/Bundle/ChillBudgetBundle/Form/Admin/ResourceKindType.php
+++ b/src/Bundle/ChillBudgetBundle/Form/Admin/ResourceKindType.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -25,7 +26,11 @@ class ResourceKindType extends AbstractType
     {
         $builder
             ->add('name', TranslatableStringFormType::class, [
-                'label' => 'Nom',
+                'label' => 'Title',
+            ])
+            ->add('kind', TextType::class, [
+                'label' => 'budget.admin.form.Resource_kind_key',
+                'help' => 'budget.admin.form.This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document'
             ])
             ->add('ordering', NumberType::class)
             ->add('isActive', CheckboxType::class, [
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Admin/Charge/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Admin/Charge/index.html.twig
index 2486aaecf..4f56c92cb 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Admin/Charge/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Admin/Charge/index.html.twig
@@ -19,7 +19,10 @@
 			{% for entity in entities %}
 				<tr>
                     <td>{{ entity.ordering }}</td>
-					<td>{{ entity|chill_entity_render_box }}</td>
+					<td>
+                        {{ entity|chill_entity_render_box }}<br/>
+                        <strong>{{ 'budget.admin.form.Charge_kind_key'|trans }}&nbsp;:</strong> <code>{{ entity.kind }}</code>
+                    </td>
 					<td style="text-align:center;">
 						{%- if entity.isActive -%}
 							<i class="fa fa-check-square-o"></i>
@@ -39,6 +42,8 @@
 		</tbody>
 	</table>
 
+    {{ chill_pagination(paginator) }}
+
 	<ul class="record_actions sticky-form-buttons">
 		<li>
 			<a href="{{ path('chill_crud_charge_kind_new') }}" class="btn btn-create">
diff --git a/src/Bundle/ChillBudgetBundle/Resources/views/Admin/Resource/index.html.twig b/src/Bundle/ChillBudgetBundle/Resources/views/Admin/Resource/index.html.twig
index 35bf88609..62d25c0ca 100644
--- a/src/Bundle/ChillBudgetBundle/Resources/views/Admin/Resource/index.html.twig
+++ b/src/Bundle/ChillBudgetBundle/Resources/views/Admin/Resource/index.html.twig
@@ -19,7 +19,10 @@
 			{% for entity in entities %}
 				<tr>
                     <td>{{ entity.ordering }}</td>
-					<td>{{ entity|chill_entity_render_box }}</td>
+                    <td>
+                        {{ entity|chill_entity_render_box }}<br/>
+                        <strong>{{ 'budget.admin.form.Resource_kind_key'|trans }}&nbsp;:</strong> <code>{{ entity.kind }}</code>
+                    </td>
 					<td style="text-align:center;">
 						{%- if entity.isActive -%}
 							<i class="fa fa-check-square-o"></i>
@@ -39,6 +42,8 @@
 		</tbody>
 	</table>
 
+    {{ chill_pagination(paginator) }}
+
 	<ul class="record_actions sticky-form-buttons">
 		<li>
 			<a href="{{ path('chill_crud_resource_kind_new') }}" class="btn btn-create">
diff --git a/src/Bundle/ChillBudgetBundle/migrations/Version20230209161546.php b/src/Bundle/ChillBudgetBundle/migrations/Version20230209161546.php
new file mode 100644
index 000000000..618b0c982
--- /dev/null
+++ b/src/Bundle/ChillBudgetBundle/migrations/Version20230209161546.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Budget;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20230209161546 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Budget: add unique constraint on kind for charge_kind and resource_kind';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql("UPDATE chill_budget.resource_type SET kind=md5(random()::text) WHERE kind = ''");
+        $this->addSql("UPDATE chill_budget.charge_type SET kind=md5(random()::text) WHERE kind = ''");
+        $this->addSql('CREATE UNIQUE INDEX resource_kind_unique_type_idx ON chill_budget.resource_type (kind);');
+        $this->addSql('CREATE UNIQUE INDEX charge_kind_unique_type_idx ON chill_budget.charge_type (kind);');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX resource_kind_unique_type_idx');
+        $this->addSql('DROP INDEX charge_kind_unique_type_idx');
+    }
+}
diff --git a/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
index 8337dff87..b20477150 100644
--- a/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillBudgetBundle/translations/messages.fr.yml
@@ -77,6 +77,13 @@ The balance: Différence entre ressources et charges
 Valid since %startDate% until %endDate%: Valide depuis le %startDate% jusqu'au %endDate%
 Valid since %startDate%: Valide depuis le %startDate%
 
+budget:
+    admin:
+        form:
+            Charge_kind_key: Clé d'identification
+            Resource_kind_key: Clé d'identification
+            This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document: Cette clé sert à identifier le type de charge ou de revenu lors de la génération de document. Seuls les caractères alpha-numériques sont autorisés. Modifier cette clé peut avoir un effet lors de la génération de nouveaux documents.
+
 # ROLES
 Budget elements: Budget
 CHILL_BUDGET_ELEMENT_CREATE: Créer une ressource/charge
diff --git a/src/Bundle/ChillBudgetBundle/translations/validators.fr.yml b/src/Bundle/ChillBudgetBundle/translations/validators.fr.yml
index 7281b6380..01b240eac 100644
--- a/src/Bundle/ChillBudgetBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillBudgetBundle/translations/validators.fr.yml
@@ -1,2 +1,8 @@
 The amount cannot be empty: Le montant ne peut pas être vide ou égal à zéro
-The budget element's end date must be after the start date: La date de fin doit être après la date de début
\ No newline at end of file
+The budget element's end date must be after the start date: La date de fin doit être après la date de début
+
+budget:
+    admin:
+        form:
+            kind:
+                only_alphanumeric