diff --git a/components/alert/alert.twig b/components/alert/alert.twig
index 296fe66ae8325c5b8dd577ad7513008b80b9c285..97687f05150cd5d643adea560594465ab6c5ff3d 100644
--- a/components/alert/alert.twig
+++ b/components/alert/alert.twig
@@ -1,5 +1,5 @@
-{% if variant and variant|lower != 'default' %}
-  {% set variants = variant|split('__')|map(v => v|lower|replace({(v): 'fr-alert--' ~ v})|replace({_: '-'})) %}
+{% if variant and variant != 'default' %}
+  {% set variants = variant|split('__')|map(v => v|replace({(v): 'fr-alert--' ~ v})) %}
   {% set attributes = attributes.addClass(variants) %}
 {% endif %}
 
diff --git a/components/badge/badge.twig b/components/badge/badge.twig
index fc1353ba935132d51569333821a13a05adfaecb0..f5bbf37cd5a012165845f0aa666facb95ddd3db8 100644
--- a/components/badge/badge.twig
+++ b/components/badge/badge.twig
@@ -1,5 +1,5 @@
-{% if variant and variant|lower != 'default' %}
-  {% set attributes = attributes.addClass('fr-badge--' ~ variant|lower|replace({_: '-'})) %}
+{% if variant and variant != 'default' %}
+  {% set attributes = attributes.addClass('fr-badge--' ~ variant) %}
 {% endif %}
 
 {% if system_type %}
diff --git a/components/button/button.preview.story.yml b/components/button/button.preview.story.yml
index f7e10c1284fc09356ce1c6fa9a4c0ee1daca349c..07330e9edaecf54b4c16b6afead584caea09df4d 100644
--- a/components/button/button.preview.story.yml
+++ b/components/button/button.preview.story.yml
@@ -8,5 +8,5 @@ props:
   icon_position: left
   icon:
     pack_id: dsfr
-    settings: { }
+    settings: {}
     icon_id: checkbox-circle-line
diff --git a/components/button/button.twig b/components/button/button.twig
index 4f0f5ff7a587e7afff94d45560a4329d79d88f4a..b1d7c18f387135347e94b8887edd9625f496bb2b 100644
--- a/components/button/button.twig
+++ b/components/button/button.twig
@@ -1,5 +1,5 @@
-{% if variant and variant|lower != 'default' %}
-  {% set variants = variant|split('__')|map(v => v|lower|replace({(v): 'fr-btn--' ~ v})|replace({_: '-'})) %}
+{% if variant and variant != 'default' %}
+  {% set variants = variant|split('__')|map(v => v|replace({(v): 'fr-btn--' ~ v})|replace({_: '-'})) %}
   {% set attributes = attributes.addClass(variants) %}
 {% endif %}
 
diff --git a/components/button_group/button_group.preview.story.yml b/components/button_group/button_group.preview.story.yml
index e9ba14f9f59cf8a933580d0117b135ff3734eccf..cad3bfaf55b92f89b080b4a25a7c5b7593cae5da 100644
--- a/components/button_group/button_group.preview.story.yml
+++ b/components/button_group/button_group.preview.story.yml
@@ -9,7 +9,7 @@ slots:
       props:
         icon:
           pack_id: dsfr
-          settings: { }
+          settings: {}
           icon_id: arrow-right-line
         icon_position: right
     - type: component
diff --git a/components/button_group/button_group.twig b/components/button_group/button_group.twig
index 3f69da2647e84901e0b60143a9db80e4be7a2a84..d37f6305154f362633732cc2189ac7ca5fb0429c 100644
--- a/components/button_group/button_group.twig
+++ b/components/button_group/button_group.twig
@@ -1,5 +1,5 @@
-{% if variant and variant|lower != 'default' %}
-  {% set variants = variant|split('__')|map(v => v|lower|replace({(v): 'fr-btns-group--' ~ v})|replace({_: '-'})) %}
+{% if variant and variant != 'default' %}
+  {% set variants = variant|split('__')|map(v => v|replace({(v): 'fr-btns-group--' ~ v})) %}
   {% set attributes = attributes.addClass(variants) %}
 {% endif %}
 
diff --git a/components/callout/callout.preview.story.yml b/components/callout/callout.preview.story.yml
index 94a2a2eed5f59b0e2835ce5ebbeb1a900c9deafe..49e8fbbe7f713db73531c7a2d6f090a95cd0c0c6 100644
--- a/components/callout/callout.preview.story.yml
+++ b/components/callout/callout.preview.story.yml
@@ -12,5 +12,5 @@ props:
   color_schema: green-tilleul-verveine
   icon:
     pack_id: dsfr
-    settings: { }
+    settings: {}
     icon_id: alert-line
diff --git a/components/card/card.preview.story.yml b/components/card/card.preview.story.yml
index 40dea2a58f877f006c40c891f8db32ab53e1eb97..ba9d1dd8fd46733c0d5fdec60950d67431c095a1 100644
--- a/components/card/card.preview.story.yml
+++ b/components/card/card.preview.story.yml
@@ -62,9 +62,9 @@ props:
   bg_boxes: shadow
   detail_icon:
     pack_id: dsfr
-    settings: { }
+    settings: {}
     icon_id: checkbox-circle-line
   detail_end_icon:
     pack_id: dsfr
-    settings: { }
+    settings: {}
     icon_id: alert-fill
diff --git a/components/card/card.twig b/components/card/card.twig
index 0001fd3182f811491c846a5001aed0e29af1cfb3..9192fd080735dc4ac40958f74a856c509baad4cd 100644
--- a/components/card/card.twig
+++ b/components/card/card.twig
@@ -1,5 +1,5 @@
-{% if variant and variant|lower != 'default' %}
-  {% set variants = variant|split('__')|map(v => v|lower|replace({(v): 'fr-card--' ~ v})|replace({_: '-'})) %}
+{% if variant and variant != 'default' %}
+  {% set variants = variant|split('__')|map(v => v|replace({(v): 'fr-card--' ~ v})) %}
   {% set attributes = attributes.addClass(variants) %}
   {% if 'fr-card--horizontal' in variants and horizontal_ratio %}
     {% set attributes = attributes.addClass('fr-card--horizontal-' ~ horizontal_ratio) %}
diff --git a/components/content_media/content_media.twig b/components/content_media/content_media.twig
index 614c3b65c654fbcf7a20a3c7b3d8355532a2bb5f..ad4171545a2423ffcae4f58cf235410752af3fd3 100644
--- a/components/content_media/content_media.twig
+++ b/components/content_media/content_media.twig
@@ -1,5 +1,5 @@
-{% if variant and variant|lower != 'default' %}
-  {% set attributes = attributes.addClass('fr-content-media--' ~ variant|lower|replace({_: '-'})) %}
+{% if variant and variant != 'default' %}
+  {% set attributes = attributes.addClass('fr-content-media--' ~ variant) %}
 {% endif %}
 
 {% if caption or transcription %}
diff --git a/components/download_block/download_block.preview.story.yml b/components/download_block/download_block.preview.story.yml
index 65965dc97b1b185ffb429a97eaba4450453d5496..1c6ea0a11f71bc27b733d45c93158b322d9e88fd 100644
--- a/components/download_block/download_block.preview.story.yml
+++ b/components/download_block/download_block.preview.story.yml
@@ -8,5 +8,5 @@ props:
   new_window: true
   detail_icon:
     pack_id: dsfr
-    settings: { }
+    settings: {}
     icon_id: file-pdf-line
diff --git a/components/france_connect/france_connect.twig b/components/france_connect/france_connect.twig
index 7289c1032b8c786a3fff6b0c72100bc59272d5a2..b60b9ecce7cfd1c5d1aedde949fe91357da454a9 100644
--- a/components/france_connect/france_connect.twig
+++ b/components/france_connect/france_connect.twig
@@ -1,8 +1,8 @@
 {% set brand = 'FranceConnect'|t %}
 {% set url = 'https://franceconnect.gouv.fr/' %}
 
-{% if variant and variant|lower != 'default' %}
-  {% set attributes = attributes.addClass('fr-connect--' ~ variant|lower|replace({_: '-'})) %}
+{% if variant and variant != 'default' %}
+  {% set attributes = attributes.addClass('fr-connect--' ~ variant) %}
   {% set brand = 'FranceConnect'|t %}
   {% set url = 'https://franceconnect.gouv.fr/france-connect-plus' %}
 {% endif %}
diff --git a/components/header/header.preview.story.yml b/components/header/header.preview.story.yml
index f47c66fec639e465f477a069c69bd1a43eb181b5..c75e3a3038a0807bded35f446a656becf1ec4d3c 100644
--- a/components/header/header.preview.story.yml
+++ b/components/header/header.preview.story.yml
@@ -18,7 +18,7 @@ slots:
           props:
             icon:
               pack_id: dsfr
-              settings: { }
+              settings: {}
               icon_id: add-circle-line
         - type: component
           component: "ui_suite_dsfr:link"
@@ -28,7 +28,7 @@ slots:
           props:
             icon:
               pack_id: dsfr
-              settings: { }
+              settings: {}
               icon_id: lock-line
         - type: component
           component: "ui_suite_dsfr:link"
@@ -38,7 +38,7 @@ slots:
           props:
             icon:
               pack_id: dsfr
-              settings: { }
+              settings: {}
               icon_id: account-line
   navbar:
     type: component
diff --git a/components/highlight/highlight.twig b/components/highlight/highlight.twig
index f52e84f9103db6c91f2c95b6dec42eff6003b214..9b34f02a1cd922a130b8e3320d647407c8f6bc18 100644
--- a/components/highlight/highlight.twig
+++ b/components/highlight/highlight.twig
@@ -1,6 +1,6 @@
 {% set text_attributes = create_attribute() %}
-{% if variant and variant|lower != 'default' %}
-  {% set text_attributes = text_attributes.addClass('fr-text--' ~ variant|lower) %}
+{% if variant and variant != 'default' %}
+  {% set text_attributes = text_attributes.addClass('fr-text--' ~ variant) %}
 {% endif %}
 
 {% if color_schema %}
diff --git a/components/link/link.preview.story.yml b/components/link/link.preview.story.yml
index 1f1cb7eae5a000f74be7a5b077e183d0aa2c91e4..f026372ebbd8dcde9a517f6eb16e51b60ae661fb 100644
--- a/components/link/link.preview.story.yml
+++ b/components/link/link.preview.story.yml
@@ -10,5 +10,5 @@ props:
   icon_position: left
   icon:
     pack_id: dsfr
-    settings: { }
+    settings: {}
     icon_id: arrow-right-line
diff --git a/components/link/link.twig b/components/link/link.twig
index d7f821adbbae056cc59141d724e382e26eb2e94e..4b5ada8494afe758bce4ce2abda095f3f0b2a956 100644
--- a/components/link/link.twig
+++ b/components/link/link.twig
@@ -1,5 +1,5 @@
-{% if variant and variant|lower != 'default' and not external %}
-  {% set attributes = attributes.addClass('fr-link--' ~ variant|lower|replace({_: '-'})) %}
+{% if variant and variant != 'default' and not external %}
+  {% set attributes = attributes.addClass('fr-link--' ~ variant) %}
 {% endif %}
 
 {% set attributes = attributes.addClass('fr-link') %}
diff --git a/components/modal/modal.preview.story.yml b/components/modal/modal.preview.story.yml
index 32bd33d2d882abdd07709240f88efbb27513d83b..d68e34fad5893eaa20b3c04be1ed1d80dfe6b396 100644
--- a/components/modal/modal.preview.story.yml
+++ b/components/modal/modal.preview.story.yml
@@ -17,7 +17,7 @@ slots:
             props:
               icon:
                 pack_id: dsfr
-                settings: { }
+                settings: {}
                 icon_id: check-line
               icon_position: left
           - type: component
@@ -32,5 +32,5 @@ slots:
 props:
   icon:
     pack_id: dsfr
-    settings: { }
+    settings: {}
     icon_id: question-line
diff --git a/components/modal/modal.twig b/components/modal/modal.twig
index 454cf58c31ba323798d2a3b17cd25324c42b4bf0..5f7308b14074729d6aaa710d41b140bb618f8474 100644
--- a/components/modal/modal.twig
+++ b/components/modal/modal.twig
@@ -1,10 +1,10 @@
-{% if not variant or variant|lower == 'default' %}
+{% if not variant or variant == 'default' %}
   {% set attributes = attributes.addClass('fr-col-md-6') %}
 {% endif %}
-{% if variant|lower == 'sm' %}
+{% if variant == 'sm' %}
   {% set attributes = attributes.addClass('fr-col-md-4') %}
 {% endif %}
-{% if variant|lower == 'lg' %}
+{% if variant == 'lg' %}
   {% set attributes = attributes.addClass('fr-col-md-8') %}
 {% endif %}
 {% set modal_id = id|default('modal-' ~ random()) %}
diff --git a/components/side_menu/side_menu.twig b/components/side_menu/side_menu.twig
index d038f9ff77ae6c6faf0774227f07d90fd5cd663f..59e649adc63d7133b2f344f09cbd0a49c2f4d77b 100644
--- a/components/side_menu/side_menu.twig
+++ b/components/side_menu/side_menu.twig
@@ -1,5 +1,5 @@
-{% if variant and variant|lower != 'default' %}
-  {% set attributes = attributes.addClass('fr-sidemenu--' ~ variant|lower|replace({_: '-'})) %}
+{% if variant and variant != 'default' %}
+  {% set attributes = attributes.addClass('fr-sidemenu--' ~ variant|replace({_: '-'})) %}
 {% endif %}
 
 {% if position and position|lower != 'default' %}
diff --git a/components/tab/tab.preview.story.yml b/components/tab/tab.preview.story.yml
index 846e3131d46013b3e4232ce3824c94c5c0af1b55..1e8386e8660b65ced7b0e1c05b595a235c12f5aa 100644
--- a/components/tab/tab.preview.story.yml
+++ b/components/tab/tab.preview.story.yml
@@ -4,5 +4,5 @@ slots:
 props:
   icon:
     pack_id: dsfr
-    settings: { }
+    settings: {}
     icon_id: checkbox-circle-line
diff --git a/components/tab/tab.twig b/components/tab/tab.twig
index 1f8559a6f076dc3721c84ea75bca215935a4d803..b53badef2c31b59f31d8cf1c83ff2aa56ea4c0ff 100644
--- a/components/tab/tab.twig
+++ b/components/tab/tab.twig
@@ -6,7 +6,7 @@
 {% if id %}
   {% set attributes = attributes.setAttribute('id', 'tab-' ~ id).setAttribute('aria-controls', 'panel-' ~ id) %}
 {% endif %}
-{% if variant|lower == 'selected' %}
+{% if variant == 'selected' %}
   {% set attributes = attributes.setAttribute('tabindex', '0').setAttribute('aria-selected', 'true').addClass('fr-tabs__tab--selected') %}
 {% endif %}
 
diff --git a/components/tab_panel/tab_panel.twig b/components/tab_panel/tab_panel.twig
index a9de2151bb5b66a95bd7157b9df20ea1d438e458..9bcdd6e3ec3a561f6719ed9d03febf68695d05a6 100644
--- a/components/tab_panel/tab_panel.twig
+++ b/components/tab_panel/tab_panel.twig
@@ -2,7 +2,7 @@
 {% if id %}
   {% set attributes = attributes.setAttribute('id', 'panel-' ~ id).setAttribute('aria-labelledby', 'tab-' ~ id) %}
 {% endif %}
-{% if variant|lower == 'selected' %}
+{% if variant == 'selected' %}
   {% set attributes = attributes.setAttribute('tabindex', '0').addClass('fr-tabs__panel--selected') %}
 {% endif %}
 
diff --git a/components/tag/tag.preview.story.yml b/components/tag/tag.preview.story.yml
index 3d113285be933237f1827520ddda95f17d493a80..d7f003440e028500f999761b0cbccd0ad612b437 100644
--- a/components/tag/tag.preview.story.yml
+++ b/components/tag/tag.preview.story.yml
@@ -7,5 +7,5 @@ props:
   color_schema: brown-caramel
   icon:
     pack_id: dsfr
-    settings: { }
+    settings: {}
     icon_id: checkbox-circle-line
diff --git a/components/tag/tag.twig b/components/tag/tag.twig
index 21fcd080e3f3a0f12148c8591728f096421f7860..23b71fbdcea358cdecc9baea77184a1eff2ede3d 100644
--- a/components/tag/tag.twig
+++ b/components/tag/tag.twig
@@ -1,5 +1,5 @@
-{% if variant and variant|lower != 'default' %}
-  {% set attributes = attributes.addClass('fr-tag--' ~ variant|lower|replace({_: '-'})) %}
+{% if variant and variant != 'default' %}
+  {% set attributes = attributes.addClass('fr-tag--' ~ variant) %}
 {% endif %}
 
 {% if not dismissible and icon.icon_id %}
diff --git a/components/tile/tile.twig b/components/tile/tile.twig
index 706ddf4cf13316d30029dca76cf086e2b0c5feef..24b986eff1cdff4867793496a1d291bf7029ca6a 100644
--- a/components/tile/tile.twig
+++ b/components/tile/tile.twig
@@ -1,5 +1,5 @@
-{% if variant and variant|lower != 'default' %}
-  {% set variants = variant|split('__')|map(v => v|lower|replace({(v): 'fr-tile--' ~ v})|replace({_: '-'})) %}
+{% if variant and variant != 'default' %}
+  {% set variants = variant|split('__')|map(v => v|replace({(v): 'fr-tile--' ~ v})) %}
   {% set attributes = attributes.addClass(variants) %}
 {% endif %}
 
diff --git a/components/translate/translate.twig b/components/translate/translate.twig
index e5a82ea8bd5b92a23f6e9e965b0ee7e7adf187a1..cb29b72d7032723fe9e5495566477d8339051ac6 100644
--- a/components/translate/translate.twig
+++ b/components/translate/translate.twig
@@ -3,7 +3,7 @@
 {% if links -%}
   <nav{{ attributes.addClass(['fr-translate', 'fr-nav']) }} role="navigation">
     <div class="fr-nav__item">
-      <button class="fr-translate__btn fr-btn fr-btn--tertiary{% if variant|lower == 'no-outline' %}-no-outline{% endif %}" aria-controls="{{ translate_id }}" aria-expanded="false" title="{{ 'Select a language'|t }}" type="button">
+      <button class="fr-translate__btn fr-btn fr-btn--tertiary{% if variant == 'no-outline' %}-no-outline{% endif %}" aria-controls="{{ translate_id }}" aria-expanded="false" title="{{ 'Select a language'|t }}" type="button">
         {{ title }}
       </button>
       <div class="fr-collapse fr-translate__menu fr-menu" id="{{ translate_id }}">