diff --git a/assets/styles/configuration.scss b/assets/styles/configuration.scss
index 42158745..9949d188 100644
--- a/assets/styles/configuration.scss
+++ b/assets/styles/configuration.scss
@@ -473,6 +473,6 @@ livechat-image-file-input {
   }
 }
 
-livechat-configuration-row {
+livechat-configuration-section-header {
   margin-top: 3rem;
 }
diff --git a/client/common/configuration/elements/channel-configuration.ts b/client/common/configuration/elements/channel-configuration.ts
index 3d669cb2..23d23612 100644
--- a/client/common/configuration/elements/channel-configuration.ts
+++ b/client/common/configuration/elements/channel-configuration.ts
@@ -251,11 +251,11 @@ export class ChannelConfigurationElement extends LivechatElement {
           </p>
 
           <form livechat-configuration-channel-options role="form" @submit=${this._saveConfig}>
-            <livechat-configuration-row
+            <livechat-configuration-section-header
               .title=${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_SLOW_MODE_LABEL)}
               .description=${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_SLOW_MODE_DESC, true)}
               .helpPage=${'documentation/user/streamers/slow_mode'}>
-            </livechat-configuration-row>
+            </livechat-configuration-section-header>
             <div class="form-group">
               <label>
                 ${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_SLOW_MODE_LABEL)}
@@ -281,11 +281,11 @@ export class ChannelConfigurationElement extends LivechatElement {
               ${this._renderFeedback('peertube-livechat-slowmode-duration-feedback', 'slowMode.duration')}
             </div>
 
-            <livechat-configuration-row
+            <livechat-configuration-section-header
               .title=${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_BOT_OPTIONS_TITLE)}
               .description=${''}
               .helpPage=${'documentation/user/streamers/channel'}>
-            </livechat-configuration-row>
+            </livechat-configuration-section-header>
             <div class="form-group">
               <label>
                 <input
@@ -332,11 +332,11 @@ export class ChannelConfigurationElement extends LivechatElement {
                 ${this._renderFeedback('peertube-livechat-bot-nickname-feedback', 'bot.nickname')}
               </div>
 
-              <livechat-configuration-row
+              <livechat-configuration-section-header
                 .title=${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_LABEL)}
                 .description=${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_FORBIDDEN_WORDS_DESC)}
                 .helpPage=${'documentation/user/streamers/bot/forbidden_words'}>
-              </livechat-configuration-row>
+              </livechat-configuration-section-header>
               <livechat-dynamic-table-form
                 .header=${tableHeaderList.forbiddenWords}
                 .schema=${tableSchema.forbiddenWords}
@@ -353,11 +353,11 @@ export class ChannelConfigurationElement extends LivechatElement {
                 .formName=${'forbidden-words'}
               ></livechat-dynamic-table-form>
 
-              <livechat-configuration-row
+              <livechat-configuration-section-header
                 .title=${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_LABEL)}
                 .description=${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_QUOTE_DESC)}
                 .helpPage=${'documentation/user/streamers/bot/quotes'}>
-              </livechat-configuration-row>
+              </livechat-configuration-section-header>
               <livechat-dynamic-table-form
                 .header=${tableHeaderList.quotes}
                 .schema=${tableSchema.quotes}
@@ -374,11 +374,11 @@ export class ChannelConfigurationElement extends LivechatElement {
                 .formName=${'quote'}
               ></livechat-dynamic-table-form>
 
-              <livechat-configuration-row
+              <livechat-configuration-section-header
                 .title=${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_LABEL)}
                 .description=${ptTr(LOC_LIVECHAT_CONFIGURATION_CHANNEL_COMMAND_DESC)}
                 .helpPage=${'documentation/user/streamers/bot/commands'}>
-              </livechat-configuration-row>
+              </livechat-configuration-section-header>
               <livechat-dynamic-table-form
                 .header=${tableHeaderList.commands}
                 .schema=${tableSchema.commands}
diff --git a/client/common/lib/elements/configuration-row.ts b/client/common/lib/elements/configuration-section-header.ts
similarity index 93%
rename from client/common/lib/elements/configuration-row.ts
rename to client/common/lib/elements/configuration-section-header.ts
index f2fdaa14..e8357342 100644
--- a/client/common/lib/elements/configuration-row.ts
+++ b/client/common/lib/elements/configuration-section-header.ts
@@ -6,7 +6,7 @@ import { html } from 'lit'
 import { customElement, property } from 'lit/decorators.js'
 import { LivechatElement } from './livechat'
 
-@customElement('livechat-configuration-row')
+@customElement('livechat-configuration-section-header')
 export class ConfigurationRowElement extends LivechatElement {
   @property({ attribute: false })
   public override title: string = 'title'
diff --git a/client/common/lib/elements/dynamic-table-form.ts b/client/common/lib/elements/dynamic-table-form.ts
index 6202ca78..d6beba99 100644
--- a/client/common/lib/elements/dynamic-table-form.ts
+++ b/client/common/lib/elements/dynamic-table-form.ts
@@ -197,6 +197,7 @@ export class DynamicTableFormElement extends LivechatElement {
     this._updateLastRowId()
 
     // Filter removed rows
+    // FIXME: seems buggy. Missing assignation?
     this._rowsById.filter(rowById => this.rows.includes(rowById.row))
 
     for (let i = 0; i < this.rows.length; i++) {
diff --git a/client/common/lib/elements/index.js b/client/common/lib/elements/index.js
index f0b920d3..1a147d5a 100644
--- a/client/common/lib/elements/index.js
+++ b/client/common/lib/elements/index.js
@@ -6,7 +6,7 @@
 // Add here all your elements, the main JS file will import them all.
 import './help-button'
 import './dynamic-table-form'
-import './configuration-row'
+import './configuration-section-header'
 import './tags-input'
 import './image-file-input'
 import './spinner'