diff --git a/tests/src/Functional/TaxonomyViewsIntegratorTestBase.php b/tests/src/Functional/TaxonomyViewsIntegratorTestBase.php
index c3b846f..83a901e 100644
--- a/tests/src/Functional/TaxonomyViewsIntegratorTestBase.php
+++ b/tests/src/Functional/TaxonomyViewsIntegratorTestBase.php
@@ -285,7 +285,7 @@ abstract class TaxonomyViewsIntegratorTestBase extends BrowserTestBase {
       ->set('view', 'tvi_page')
       ->set('view_display', 'page_1')
       ->set('inherit_settings', 1)
-      ->set('uuid', $this->vocabulary1->uuid())
+      ->set('vocabulary_uuid', $this->vocabulary1->uuid())
       ->save();
 
     // set vocabulary2 config
@@ -299,7 +299,7 @@ abstract class TaxonomyViewsIntegratorTestBase extends BrowserTestBase {
       ->set('view', 'tvi_page')
       ->set('view_display', 'page_1')
       ->set('inherit_settings', 0)
-      ->set('uuid', $this->term1->uuid())
+      ->set('vocabulary_uuid', $this->term1->uuid())
       ->save();
 
     // term 2
@@ -308,7 +308,7 @@ abstract class TaxonomyViewsIntegratorTestBase extends BrowserTestBase {
       ->set('view', 'tvi_page')
       ->set('view_display', 'page_2')
       ->set('inherit_settings', 1)
-      ->set('uuid', $this->term2->uuid())
+      ->set('vocabulary_uuid', $this->term2->uuid())
       ->save();
 
     // term 3
@@ -327,7 +327,7 @@ abstract class TaxonomyViewsIntegratorTestBase extends BrowserTestBase {
       ->set('view', 'tvi_page')
       ->set('view_display', 'page_1')
       ->set('inherit_settings', 0)
-      ->set('uuid', $this->term5->uuid())
+      ->set('vocabulary_uuid', $this->term5->uuid())
       ->save();
 
     // term 6
@@ -346,7 +346,7 @@ abstract class TaxonomyViewsIntegratorTestBase extends BrowserTestBase {
       ->set('view', 'tvi_page')
       ->set('view_display', 'page_1')
       ->set('inherit_settings', 0)
-      ->set('uuid', $this->term8->uuid())
+      ->set('vocabulary_uuid', $this->term8->uuid())
       ->save();
 
     // term 9
@@ -360,7 +360,7 @@ abstract class TaxonomyViewsIntegratorTestBase extends BrowserTestBase {
       ->set('view', 'tvi_page')
       ->set('view_display', 'page_2')
       ->set('inherit_settings', 1)
-      ->set('uuid', $this->term10->uuid())
+      ->set('vocabulary_uuid', $this->term10->uuid())
       ->save();
 
     // term 11
@@ -374,7 +374,7 @@ abstract class TaxonomyViewsIntegratorTestBase extends BrowserTestBase {
       ->set('view', 'tvi_page')
       ->set('view_display', 'page_1')
       ->set('inherit_settings', 0)
-      ->set('uuid', $this->term12->uuid())
+      ->set('vocabulary_uuid', $this->term12->uuid())
       ->save();
 
     $this->refreshVariables();
diff --git a/tvi.module b/tvi.module
index afcf16b..dcbe6a4 100755
--- a/tvi.module
+++ b/tvi.module
@@ -236,7 +236,7 @@ function tvi_submit_handler($form, FormStateInterface $form_state) {
       ->set('view_display', $form_values['tvi_view_display'])
       ->set('inherit_settings', $form_values['tvi_inherit_settings'])
       ->set('pass_arguments', $form_values['tvi_pass_arguments'])
-      ->set('uuid', $entity->uuid())
+      ->set('vocabulary_uuid', $entity->uuid())
       ->save();
   } else {
     Drupal::configFactory()