diff --git a/config/views.view.archive.yml b/config/views.view.archive.yml
index 34961d5da12066425ce9d82147948aad33eabc2d..b3ec4c13c3a75deebbf35199f1ea331ed77f7e12 100644
--- a/config/views.view.archive.yml
+++ b/config/views.view.archive.yml
@@ -5,7 +5,7 @@ description: 'Display a list of months that link to content for that month.'
 tag: default
 base_table: node
 human_name: Archive
-core: '0'
+core: '8'
 display:
     default:
         id: default
diff --git a/config/views.view.backlinks.yml b/config/views.view.backlinks.yml
index 480b890cc1ccae13d2fc0165d9131338276ee7f6..2608b7055db04b91f9e9749e8f70e7238a279185 100644
--- a/config/views.view.backlinks.yml
+++ b/config/views.view.backlinks.yml
@@ -5,7 +5,7 @@ description: 'Displays a list of nodes that link to the node, using the search b
 tag: default
 base_table: node
 human_name: Backlinks
-core: '0'
+core: '8'
 display:
     default:
         id: default
diff --git a/config/views.view.comments_recent.yml b/config/views.view.comments_recent.yml
index 9aae19dacc7e7da679d328417a8942e026f08544..ff99fb3611acba9721e46c78a155e9a5ce3e641f 100644
--- a/config/views.view.comments_recent.yml
+++ b/config/views.view.comments_recent.yml
@@ -5,7 +5,7 @@ description: 'Contains a block and a page to list recent comments; the block wil
 tag: default
 base_table: comment
 human_name: 'Recent comments'
-core: '0'
+core: '8'
 display:
     default:
         id: default
diff --git a/config/views.view.frontpage.yml b/config/views.view.frontpage.yml
index fc1b8ec95bfe30a0c6146ef6cd76cfe3be67c4bb..47921767ab3d0bbf6b27ff6f9d8578fc9892124e 100644
--- a/config/views.view.frontpage.yml
+++ b/config/views.view.frontpage.yml
@@ -5,7 +5,7 @@ description: 'Emulates the default Drupal front page; you may set the default ho
 tag: default
 base_table: node
 human_name: 'Front page'
-core: '0'
+core: '8'
 display:
     default:
         id: default
diff --git a/config/views.view.glossary.yml b/config/views.view.glossary.yml
index 4323f23f8964eb0ef51f21a26eb879dbbe92eb6e..417f8b72e8ead53e44e83918034dcad08fd01c72 100644
--- a/config/views.view.glossary.yml
+++ b/config/views.view.glossary.yml
@@ -5,7 +5,7 @@ description: 'A list of all content, by letter.'
 tag: default
 base_table: node
 human_name: Glossary
-core: '0'
+core: '8'
 display:
     default:
         id: default
diff --git a/config/views.view.taxonomy_term.yml b/config/views.view.taxonomy_term.yml
index 035e3a4954a2818d5968c9d1443d37f69807d9d0..b1245bc9876414abd25291d265d866f128a2e337 100644
--- a/config/views.view.taxonomy_term.yml
+++ b/config/views.view.taxonomy_term.yml
@@ -5,7 +5,7 @@ description: 'A view to emulate Drupal core''s handling of taxonomy/term.'
 tag: default
 base_table: node
 human_name: 'Taxonomy term'
-core: '7'
+core: '8'
 display:
     default:
         id: default
diff --git a/config/views.view.tracker.yml b/config/views.view.tracker.yml
index 7cbc463ed1168862819ef3e425eb0b17fb6ee368..9b178298edca22023c63f116ef0a58f0aa17e202 100644
--- a/config/views.view.tracker.yml
+++ b/config/views.view.tracker.yml
@@ -5,7 +5,7 @@ description: 'Shows all new activity on system.'
 tag: default
 base_table: node
 human_name: Tracker
-core: '0'
+core: '8'
 display:
     default:
         id: default
diff --git a/help/api-upgrading.html b/help/api-upgrading.html
index 158f80916de26dab22b19bfc3b40f8dfd959a034..f17ff23ae544599b4fee6d06538713ee9ed1e110 100644
--- a/help/api-upgrading.html
+++ b/help/api-upgrading.html
@@ -10,7 +10,7 @@ <h3>Handler registry</h3>
 <pre>
 name = Example module
 description = "Gives an example of a module."
-core = 7.x
+core = 8.x
 files[] = example.module
 files[] = example.install
 
diff --git a/lib/Drupal/views/Tests/Comment/CommentTestBase.php b/lib/Drupal/views/Tests/Comment/CommentTestBase.php
index def2edfe5fce8e1391934a3780d426393e882a16..390da88d31c3942ee1cd2f6666a1897df99c85e7 100644
--- a/lib/Drupal/views/Tests/Comment/CommentTestBase.php
+++ b/lib/Drupal/views/Tests/Comment/CommentTestBase.php
@@ -50,7 +50,7 @@ function view_comment_user_uid() {
     $view->tag = 'default';
     $view->base_table = 'node';
     $view->human_name = 'test_comment_user_uid';
-    $view->core = 7;
+    $view->core = 8;
     $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
diff --git a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
index b0b6e20498c051eca16a0658882503927accee38..10f922f8f667bbc9a58042323b2e31cce1085706 100644
--- a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
+++ b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
@@ -207,7 +207,7 @@ protected function getFieldView() {
     $view->tag = 'default';
     $view->base_table = 'node';
     $view->human_name = 'view_fieldapi';
-    $view->core = 7;
+    $view->core = 8;
     $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
index dc83ecbc612c723ffdd0673ff3929d219a327ca3..6ce27ae7c66d82a9f33e3c153ed7d7c814604185 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
@@ -67,7 +67,7 @@ function viewGlossary() {
     $view->tag = 'default';
     $view->base_table = 'node';
     $view->human_name = 'test_glossary';
-    $view->core = 7;
+    $view->core = 8;
     $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
diff --git a/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index 2a2018af5de2a35a6490d43f15102ce739ed7c91..02d160d3851036e296cebceceb6b679ba69a3e78 100644
--- a/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -161,7 +161,7 @@ function views_test_between() {
     $view->tag = '';
     $view->base_table = 'node';
     $view->human_name = '';
-    $view->core = 0;
+    $view->core = 8;
     $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
diff --git a/lib/Drupal/views/Tests/Plugin/AccessTest.php b/lib/Drupal/views/Tests/Plugin/AccessTest.php
index 34b5d4277d5672b10578c45bef479ff2f5b59295..14c043d1e8e48ec4d0cb8e623aac23cc59f5e9f7 100644
--- a/lib/Drupal/views/Tests/Plugin/AccessTest.php
+++ b/lib/Drupal/views/Tests/Plugin/AccessTest.php
@@ -152,7 +152,7 @@ function view_access_none() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -175,7 +175,7 @@ function view_access_perm() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -199,7 +199,7 @@ function view_access_role() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -225,7 +225,7 @@ function view_access_dynamic() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -251,7 +251,7 @@ function view_access_static() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
diff --git a/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php b/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
index c0ced549a1332d8010d9ab37d649db0a3cb0493c..4b578c5dbc2c85794364af9c31a07de15594a38f 100644
--- a/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
+++ b/lib/Drupal/views/Tests/Plugin/ArgumentDefaultTest.php
@@ -103,7 +103,7 @@ function view_argument_default_fixed() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
diff --git a/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
index 5280b000802858590379852143b477362ad36d8e..bfedac4c60d72bb8806d527438a5936d7cbbfeef 100644
--- a/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
+++ b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php
@@ -54,7 +54,7 @@ function view_test_argument_validate_php($string) {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -86,7 +86,7 @@ function view_argument_validate_numeric() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
diff --git a/lib/Drupal/views/Tests/Plugin/DisplayTest.php b/lib/Drupal/views/Tests/Plugin/DisplayTest.php
index 25dd52abaccf09533c1b606520a739ed7222bd1f..372e4538f73445d6bc7508ecbb838747973d481d 100644
--- a/lib/Drupal/views/Tests/Plugin/DisplayTest.php
+++ b/lib/Drupal/views/Tests/Plugin/DisplayTest.php
@@ -48,7 +48,7 @@ function viewFilterGroupsOverriding() {
     $view->tag = 'default';
     $view->base_table = 'node';
     $view->human_name = 'test_filter_group_override';
-    $view->core = 7;
+    $view->core = 8;
     $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
@@ -97,7 +97,7 @@ function viewFilterGroupsUpdating() {
     $view->tag = 'default';
     $view->base_table = 'node';
     $view->human_name = 'test_filter_groups';
-    $view->core = 7;
+    $view->core = 8;
     $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
diff --git a/lib/Drupal/views/Tests/Plugin/PagerTest.php b/lib/Drupal/views/Tests/Plugin/PagerTest.php
index 2db6131b756b8df2c6f27d17d61f22558a19ae6a..c129ffeec197c5ee51327ea702a6a603f7e6a1b3 100644
--- a/lib/Drupal/views/Tests/Plugin/PagerTest.php
+++ b/lib/Drupal/views/Tests/Plugin/PagerTest.php
@@ -103,7 +103,7 @@ public function viewsStorePagerSettings() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 3;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -162,7 +162,7 @@ public function viewsPagerNoLimit() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version =3;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -238,7 +238,7 @@ public function viewsPagerLimit() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 3;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -322,7 +322,7 @@ function viewPagerFullZeroItemsPerPage() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 3;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -362,7 +362,7 @@ function viewsPagerFull() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 3;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -388,7 +388,7 @@ function viewsPagerFullFields() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 3;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
diff --git a/lib/Drupal/views/Tests/QueryGroupByTest.php b/lib/Drupal/views/Tests/QueryGroupByTest.php
index 4ccfdbea6fb6e491d1e3f342e6b5b4a06f86cd00..2f91a27a715114abdc0d8030aa959cd03f4dc7c5 100644
--- a/lib/Drupal/views/Tests/QueryGroupByTest.php
+++ b/lib/Drupal/views/Tests/QueryGroupByTest.php
@@ -71,7 +71,7 @@ public function viewsAggregateCountView() {
     $view->tag = '';
     $view->base_table = 'node';
     $view->human_name = '';
-    $view->core = 7;
+    $view->core = 8;
     $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
@@ -157,7 +157,7 @@ function viewsGroupByViewHelper($group_by) {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -251,7 +251,7 @@ public function viewsGroupByCountViewOnlyFilters() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
diff --git a/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php b/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php
index fe927407f9b5f066eddb1ffd1ae81ac195869b7b..0e3923eafee66af063bb34d4c78c50221b172a8c 100644
--- a/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php
+++ b/lib/Drupal/views/Tests/Taxonomy/RelationshipNodeTermDataTest.php
@@ -82,7 +82,7 @@ function view_taxonomy_node_term_data() {
     $view->tag = '';
     $view->base_table = 'node';
     $view->human_name = 'test_taxonomy_node_term_data';
-    $view->core = 7;
+    $view->core = 8;
     $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
diff --git a/lib/Drupal/views/Tests/TranslatableTest.php b/lib/Drupal/views/Tests/TranslatableTest.php
index 14a7e8eb5c3bf0a9661328819c07cceb9472d9f9..91f674d723799433fe5027b3cddc66c34fbaec5b 100644
--- a/lib/Drupal/views/Tests/TranslatableTest.php
+++ b/lib/Drupal/views/Tests/TranslatableTest.php
@@ -148,7 +148,7 @@ public function view_unpack_translatable() {
     $view->description = '';
     $view->tag = '';
     $view->base_table = 'node';
-    $view->api_version = '3.0-alpha1';
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
diff --git a/lib/Drupal/views/Tests/UpgradeTestCase.php b/lib/Drupal/views/Tests/UpgradeTestCase.php
index d770306675e39ef675c4a600f5fe85494679bc5c..affe8afdcc4ad55d722c0e5aa8391c0b344ab287 100644
--- a/lib/Drupal/views/Tests/UpgradeTestCase.php
+++ b/lib/Drupal/views/Tests/UpgradeTestCase.php
@@ -127,7 +127,7 @@ public function viewsMovedToField() {
     $view->view_php = '';
     $view->base_table = 'views_test';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -148,7 +148,7 @@ public function viewsMovedToHandler() {
     $view->view_php = '';
     $view->base_table = 'views_test';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -173,7 +173,7 @@ public function viewsMovedToTable() {
     $view->view_php = '';
     $view->base_table = 'views_old_table';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -194,8 +194,8 @@ protected function viewUpgradeImport() {
       $view->tag = "default";
       $view->base_table = "comments";
       $view->human_name = "";
-      $view->core = 0;
-      $view->api_version = "3.0-alpha1";
+      $view->core = 8;
+      $view->api_version = "3.0";
       $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
       /* Display: Defaults */
diff --git a/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php b/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php
index f232e5318c6f7b47eec2fb96bee6f82472bff0e2..b967911fc0f34b231cf50a36949e129de8b97c4d 100644
--- a/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php
+++ b/lib/Drupal/views/Tests/User/ArgumentDefaultTest.php
@@ -53,7 +53,7 @@ function view_plugin_argument_default_current_user() {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = '3.0-alpha1';
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
diff --git a/lib/Drupal/views/Tests/User/ArgumentValidateTest.php b/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
index ed3c22941362bd4f3e080d05bafd7dd82d16f141..977c50f76f86fceac5a598abdc46cec1c34cf9f6 100644
--- a/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
+++ b/lib/Drupal/views/Tests/User/ArgumentValidateTest.php
@@ -94,7 +94,7 @@ function view_argument_validate_user($argtype) {
     $view->view_php = '';
     $view->base_table = 'node';
     $view->is_cacheable = FALSE;
-    $view->api_version = 2;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
diff --git a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
index 2b0e0f037de4e20c396aa72ec4264644c8398b43..7ad1414bdfa98f5bf297e252e81a26c67e44a45c 100644
--- a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
+++ b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
@@ -64,7 +64,7 @@ function view_user_name() {
     $view->tag = 'default';
     $view->base_table = 'users';
     $view->human_name = 'test_views_handler_field_user_name';
-    $view->core = 7;
+    $view->core = 8;
     $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
diff --git a/lib/Drupal/views/Tests/User/UserTest.php b/lib/Drupal/views/Tests/User/UserTest.php
index 0e0d443757550a9bd18d67fa316457cf38a70496..9036c55e8c32e8619b727a9586ae653ff91abb87 100644
--- a/lib/Drupal/views/Tests/User/UserTest.php
+++ b/lib/Drupal/views/Tests/User/UserTest.php
@@ -73,8 +73,8 @@ function test_view_user_relationship() {
     $view->tag = 'default';
     $view->base_table = 'node';
     $view->human_name = 'test_user_relationship';
-    $view->core = 7;
-    $view->api_version = '3.0-alpha1';
+    $view->core = 8;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
diff --git a/lib/Drupal/views/Tests/ViewTest.php b/lib/Drupal/views/Tests/ViewTest.php
index c0866626dc1a485525e1f66d15576d5479fae47e..c7543d77566fe561edb4e470818adbdf0bcf132f 100644
--- a/lib/Drupal/views/Tests/ViewTest.php
+++ b/lib/Drupal/views/Tests/ViewTest.php
@@ -97,7 +97,7 @@ function view_test_destroy() {
     $view->tag = '';
     $view->base_table = 'node';
     $view->human_name = '';
-    $view->api_version = '3.0-alpha1';
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Master */
@@ -253,8 +253,8 @@ function view_test_delete() {
     $view->tag = '';
     $view->base_table = 'node';
     $view->human_name = 'test_view_delete';
-    $view->core = 7;
-    $view->api_version = '3.0-alpha1';
+    $view->core = 8;
+    $view->api_version = '3.0';
     $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
 
     /* Display: Defaults */
diff --git a/modules/node.views_template.inc b/modules/node.views_template.inc
index a564a87d6d8067b98c3d4b13405a72b937857532..a2da7fa3d8e36aa4d3ca8d49887d926cb0eff762 100644
--- a/modules/node.views_template.inc
+++ b/modules/node.views_template.inc
@@ -16,7 +16,7 @@ function node_views_templates() {
   $view->tag = '';
   $view->base_table = 'node';
   $view->human_name = 'Image Gallery';
-  $view->core = 7;
+  $view->core = 8;
   $view->api_version = '3.0';
   $view->disabled = TRUE; /* Edit this to true to make a default view disabled initially */
 
diff --git a/tests/views_test/config/views.view.test_argument_default_current_user.yml b/tests/views_test/config/views.view.test_argument_default_current_user.yml
index e64a92ac8a7fd6d7b0ada01010edf4b9ca76bf6c..9e589ee3a535121b30c921ba639177af0021d21f 100644
--- a/tests/views_test/config/views.view.test_argument_default_current_user.yml
+++ b/tests/views_test/config/views.view.test_argument_default_current_user.yml
@@ -1,6 +1,6 @@
-api_version: '3'
+api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
diff --git a/tests/views_test/config/views.view.test_exposed_admin_ui.yml b/tests/views_test/config/views.view.test_exposed_admin_ui.yml
index 580bf4c74bc9f8aed5a8888fa694180970fcefec..22bb89fb136d37a2ef931bec574482d94d0e607b 100644
--- a/tests/views_test/config/views.view.test_exposed_admin_ui.yml
+++ b/tests/views_test/config/views.view.test_exposed_admin_ui.yml
@@ -1,6 +1,6 @@
-api_version: '2'
+api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
diff --git a/tests/views_test/config/views.view.test_filter_in_operator_ui.yml b/tests/views_test/config/views.view.test_filter_in_operator_ui.yml
index f07be91afbb585cdc9d4d719162bb972f4a4e9fe..99140dc0b48d2ba90ad78fbad8c9d610b74ad25e 100644
--- a/tests/views_test/config/views.view.test_filter_in_operator_ui.yml
+++ b/tests/views_test/config/views.view.test_filter_in_operator_ui.yml
@@ -1,6 +1,6 @@
-api_version: '2'
+api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
diff --git a/tests/views_test/config/views.view.test_page_display.yml b/tests/views_test/config/views.view.test_page_display.yml
index 448e44ea2ef530f1712af8524bce48a3a3ce5e4b..d80c27e74d3debe3a4f484c54886dbae8c75633f 100644
--- a/tests/views_test/config/views.view.test_page_display.yml
+++ b/tests/views_test/config/views.view.test_page_display.yml
@@ -1,6 +1,6 @@
-api_version: '2'
+api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
diff --git a/tests/views_test/config/views.view.test_rename_reset_button.yml b/tests/views_test/config/views.view.test_rename_reset_button.yml
index 04b627c06dac6289c4d71f56e976fdf688698cc3..60266ce47ecd0a6e24cdcc24befcfef8345db37c 100644
--- a/tests/views_test/config/views.view.test_rename_reset_button.yml
+++ b/tests/views_test/config/views.view.test_rename_reset_button.yml
@@ -1,6 +1,6 @@
 api_version: '3.0'
 base_table: node
-core: '0'
+core: '8'
 description: ''
 disabled: '0'
 display:
diff --git a/tests/views_test/config/views.view.test_views_groupby_save.yml b/tests/views_test/config/views.view.test_views_groupby_save.yml
index 97cbeb26cea05139d847d1f60ec1efd09c0e828a..d9d4c11221c7f881ed5b8d3e5d5e1b6ec098c922 100644
--- a/tests/views_test/config/views.view.test_views_groupby_save.yml
+++ b/tests/views_test/config/views.view.test_views_groupby_save.yml
@@ -1,6 +1,6 @@
-api_version: '2'
+api_version: '3.0'
 base_table: node
-core: {  }
+core: '8'
 description: ''
 disabled: '0'
 display:
diff --git a/views.api.php b/views.api.php
index f07fbb8c7488d0848c5bb8de4891b550177dc130..a8d04a1da97ab74980790f30d48610b229dc051f 100644
--- a/views.api.php
+++ b/views.api.php
@@ -102,7 +102,7 @@
  * @code
  * name = Example module
  * description = "Gives an example of a module."
- * core = 7.x
+ * core = 8.x
  * files[] = example.module
  * files[] = example.install
  *
@@ -673,7 +673,7 @@ function hook_views_default_views() {
   $view->tag = 'default';
   $view->base_table = 'node';
   $view->human_name = 'Front page';
-  $view->core = 0;
+  $view->core = 8;
   $view->api_version = '3.0';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */