diff --git a/demo/collect_demo.info.yml b/demo/collect_demo.info.yml
index a64d3b0..876d469 100644
--- a/demo/collect_demo.info.yml
+++ b/demo/collect_demo.info.yml
@@ -1,5 +1,6 @@
 name: Collect Demo
 description: Provides examples to make it easier to discover features of the Collect module.
+package: Data
 type: module
 core: 8.x
 dependencies:
diff --git a/demo/config/optional/views.view.collect_demo.yml b/demo/config/install/views.view.collect_demo.yml
similarity index 99%
rename from demo/config/optional/views.view.collect_demo.yml
rename to demo/config/install/views.view.collect_demo.yml
index d18c517..61606aa 100644
--- a/demo/config/optional/views.view.collect_demo.yml
+++ b/demo/config/install/views.view.collect_demo.yml
@@ -32,7 +32,7 @@ display:
         type: none
         options: {  }
       query:
-        type: views_query
+        type: search_api_query
         options:
           search_api_bypass_access: false
           entity_access: false
@@ -206,4 +206,3 @@ display:
         - url.query_args
         - user.permissions
       cacheable: false
-
diff --git a/demo/config/install/core.entity_form_display.node.collect_demo.default.yml b/demo/config/optional/core.entity_form_display.node.collect_demo.default.yml
similarity index 100%
rename from demo/config/install/core.entity_form_display.node.collect_demo.default.yml
rename to demo/config/optional/core.entity_form_display.node.collect_demo.default.yml
diff --git a/demo/config/install/core.entity_view_display.node.collect_demo.default.yml b/demo/config/optional/core.entity_view_display.node.collect_demo.default.yml
similarity index 100%
rename from demo/config/install/core.entity_view_display.node.collect_demo.default.yml
rename to demo/config/optional/core.entity_view_display.node.collect_demo.default.yml
diff --git a/demo/config/install/core.entity_view_display.node.collect_demo.rss.yml b/demo/config/optional/core.entity_view_display.node.collect_demo.rss.yml
similarity index 100%
rename from demo/config/install/core.entity_view_display.node.collect_demo.rss.yml
rename to demo/config/optional/core.entity_view_display.node.collect_demo.rss.yml
diff --git a/demo/config/install/core.entity_view_display.node.collect_demo.teaser.yml b/demo/config/optional/core.entity_view_display.node.collect_demo.teaser.yml
similarity index 100%
rename from demo/config/install/core.entity_view_display.node.collect_demo.teaser.yml
rename to demo/config/optional/core.entity_view_display.node.collect_demo.teaser.yml