diff --git a/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Readability.php b/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Readability.php
index 80e6730a3aab54d9e5b3affd710e77945d4ffb7d..1a74036c2e367317ab04246db28d3851a81f60d7 100644
--- a/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Readability.php
+++ b/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Readability.php
@@ -83,7 +83,7 @@ final class Readability extends AiContentSuggestionsPluginBase {
       '#type' => 'textarea',
       '#required' => TRUE,
       '#default_value' => $prompt ?? $this->defaultPrompt . PHP_EOL,
-      '#parents' => [$this->getPluginId(), $this->getPluginId() . '_prompt'],
+      '#parents' => ['plugins', $this->getPluginId(), $this->getPluginId() . '_prompt'],
       '#states' => [
         'visible' => [
           ':input[name="' . $this->getPluginId() . '[' . $this->getPluginId() . '_enabled' . ']"]' => ['checked' => TRUE],
@@ -96,7 +96,7 @@ final class Readability extends AiContentSuggestionsPluginBase {
    * {@inheritdoc}
    */
   public function saveSettingsForm(array &$form, FormStateInterface $form_state): void {
-    $value = $form_state->getValue($this->getPluginId());
+    $value = $form_state->getValue(['plugins', $this->getPluginId()]);
     $prompt = $value[$this->getPluginId() . '_prompt'];
     $this->promptConfig->set($this->getPluginId(), $prompt)->save();
   }
diff --git a/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Summarise.php b/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Summarise.php
index 1d6e58d174d1b5821569489c637e3388da1a994a..4b35df568bf9df901e946bfa6b083c9a4e5929a1 100644
--- a/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Summarise.php
+++ b/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Summarise.php
@@ -69,7 +69,7 @@ final class Summarise extends AiContentSuggestionsPluginBase {
       '#type' => 'textarea',
       '#required' => TRUE,
       '#default_value' => $prompt ?? $this->defaultPrompt . PHP_EOL,
-      '#parents' => [$this->getPluginId(), $this->getPluginId() . '_prompt'],
+      '#parents' => ['plugins', $this->getPluginId(), $this->getPluginId() . '_prompt'],
       '#states' => [
         'visible' => [
           ':input[name="' . $this->getPluginId() . '[' . $this->getPluginId() . '_enabled' . ']"]' => ['checked' => TRUE],
@@ -82,7 +82,7 @@ final class Summarise extends AiContentSuggestionsPluginBase {
    * {@inheritdoc}
    */
   public function saveSettingsForm(array &$form, FormStateInterface $form_state): void {
-    $value = $form_state->getValue($this->getPluginId());
+    $value = $form_state->getValue(['plugins', $this->getPluginId()]);
     $prompt = $value[$this->getPluginId() . '_prompt'];
     $this->promptConfig->set($this->getPluginId(), $prompt)->save();
   }
diff --git a/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Taxonomy.php b/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Taxonomy.php
index 70eba2203e8d2c14a3bb42acf15b9b5bc68be162..2a16d62373f445bd679234bd9836b5d975f0df72 100644
--- a/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Taxonomy.php
+++ b/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Taxonomy.php
@@ -134,7 +134,7 @@ final class Taxonomy extends AiContentSuggestionsPluginBase {
       '#type' => 'textarea',
       '#required' => TRUE,
       '#default_value' => $prompt ?? $this->defaultOpenPrompt . PHP_EOL,
-      '#parents' => [$this->getPluginId(), $this->getPluginId() . '_prompt_open'],
+      '#parents' => ['plugins', $this->getPluginId(), $this->getPluginId() . '_prompt_open'],
       '#states' => [
         'visible' => [
           ':input[name="' . $this->getPluginId() . '[' . $this->getPluginId() . '_enabled' . ']"]' => ['checked' => TRUE],
@@ -147,7 +147,7 @@ final class Taxonomy extends AiContentSuggestionsPluginBase {
       '#type' => 'textarea',
       '#required' => TRUE,
       '#default_value' => $prompt ?? $this->defaultFromVocPrompt . PHP_EOL,
-      '#parents' => [$this->getPluginId(), $this->getPluginId() . '_prompt_from_voc'],
+      '#parents' => ['plugins', $this->getPluginId(), $this->getPluginId() . '_prompt_from_voc'],
       '#states' => [
         'visible' => [
           ':input[name="' . $this->getPluginId() . '[' . $this->getPluginId() . '_enabled' . ']"]' => ['checked' => TRUE],
@@ -160,7 +160,7 @@ final class Taxonomy extends AiContentSuggestionsPluginBase {
    * {@inheritdoc}
    */
   public function saveSettingsForm(array &$form, FormStateInterface $form_state): void {
-    $value = $form_state->getValue($this->getPluginId());
+    $value = $form_state->getValue(['plugins', $this->getPluginId()]);
     $prompt_open = $value[$this->getPluginId() . '_prompt_open'];
     $this->promptConfig->set($this->getPluginId() . '_open', $prompt_open)->save();
     $prompt_from_voc = $value[$this->getPluginId() . '_prompt_from_voc'];
diff --git a/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Title.php b/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Title.php
index 3bc9e762892030743ec313ac04b9f3eee629512f..0138d4bab5fbf535ed85163105af21bcfa5f5d45 100644
--- a/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Title.php
+++ b/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Title.php
@@ -65,11 +65,11 @@ final class Title extends AiContentSuggestionsPluginBase {
     parent::buildSettingsForm($form);
     $prompt = $this->promptConfig->get($this->getPluginId());
     $form[$this->getPluginId()][$this->getPluginId() . '_prompt'] = [
-      '#title' => $this->t('suggest Title prompt', []),
+      '#title' => $this->t('Suggest Title prompt', []),
       '#type' => 'textarea',
       '#required' => TRUE,
       '#default_value' => $prompt ?? $this->defaultPrompt . PHP_EOL,
-      '#parents' => [$this->getPluginId(), $this->getPluginId() . '_prompt'],
+      '#parents' => ['plugins', $this->getPluginId(), $this->getPluginId() . '_prompt'],
       '#states' => [
         'visible' => [
           ':input[name="' . $this->getPluginId() . '[' . $this->getPluginId() . '_enabled' . ']"]' => ['checked' => TRUE],
@@ -82,7 +82,7 @@ final class Title extends AiContentSuggestionsPluginBase {
    * {@inheritdoc}
    */
   public function saveSettingsForm(array &$form, FormStateInterface $form_state): void {
-    $value = $form_state->getValue($this->getPluginId());
+    $value = $form_state->getValue(['plugins', $this->getPluginId()]);
     $prompt = $value[$this->getPluginId() . '_prompt'];
     $this->promptConfig->set($this->getPluginId(), $prompt)->save();
   }
diff --git a/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Tone.php b/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Tone.php
index 58a9a6ee5544e22b28d0e06559c331ebe7995ad9..c5233b7b763623e30a989a54d0e1d5bca035efa9 100644
--- a/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Tone.php
+++ b/modules/ai_content_suggestions/src/Plugin/AiContentSuggestions/Tone.php
@@ -199,7 +199,7 @@ final class Tone extends AiContentSuggestionsPluginBase {
       '#type' => 'textarea',
       '#required' => TRUE,
       '#default_value' => $prompt ?? $this->defaultPrompt . PHP_EOL,
-      '#parents' => [$this->getPluginId(), $this->getPluginId() . '_prompt'],
+      '#parents' => ['plugins', $this->getPluginId(), $this->getPluginId() . '_prompt'],
       '#states' => [
         'visible' => [
           ':input[name="' . $this->getPluginId() . '[' . $this->getPluginId() . '_enabled' . ']"]' => ['checked' => TRUE],
@@ -213,7 +213,7 @@ final class Tone extends AiContentSuggestionsPluginBase {
       $vocabulary_options[$vocabulary->id()] = $vocabulary->label();
     }
     $form[$this->getPluginId()][$this->getPluginId() . '_taxonomy_enabled'] = [
-      '#parents' => [$this->getPluginId(), $this->getPluginId() . '_taxonomy_enabled'],
+      '#parents' => ['plugins', $this->getPluginId(), $this->getPluginId() . '_taxonomy_enabled'],
       '#type' => 'checkbox',
       '#title' => $this->t('Choose own vocabulary for tone of voice options.'),
       '#description' => $this->t('Keeping this unselected falls back to default tone of voice options (Friendly, Professional, High school, College, Five year old).'),
@@ -226,7 +226,7 @@ final class Tone extends AiContentSuggestionsPluginBase {
     ];
 
     $form[$this->getPluginId()][$this->getPluginId() . '_taxonomy'] = [
-      '#parents' => [$this->getPluginId(), $this->getPluginId() . '_taxonomy'],
+      '#parents' => ['plugins', $this->getPluginId(), $this->getPluginId() . '_taxonomy'],
       '#type' => 'select',
       '#title' => $this->t('Choose vocabulary for tone options'),
       '#options' => $vocabulary_options,
@@ -245,7 +245,7 @@ final class Tone extends AiContentSuggestionsPluginBase {
    * {@inheritdoc}
    */
   public function saveSettingsForm(array &$form, FormStateInterface $form_state): void {
-    $value = $form_state->getValue($this->getPluginId());
+    $value = $form_state->getValue(['plugins', $this->getPluginId()]);
     $taxonomy = $value[$this->getPluginId() . '_taxonomy'];
     $this->toneConfig->set($this->getPluginId() . '_taxonomy', $taxonomy)->save();
     $taxonomy_enabled = $value[$this->getPluginId() . '_taxonomy_enabled'];