diff --git a/resources/css/components/blueprints.css b/resources/css/components/blueprints.css
index 8a0667f5497..367f998efb1 100644
--- a/resources/css/components/blueprints.css
+++ b/resources/css/components/blueprints.css
@@ -2,14 +2,14 @@
    BLUEPRINTS
    ========================================================================== */
 
-.blueprint-section {
+.blueprint-tab {
     @apply p-2 min-h-40 outline-none;
 
     &.draggable-source--is-dragging {
         opacity: 0.5;
     }
 
-    &.draggable-mirror .blueprint-section-card {
+    &.draggable-mirror .blueprint-tab-card {
         @apply shadow-lg;
     }
 }
@@ -20,10 +20,10 @@
     background: rgba(0, 0, 0, 0.01) url('../../svg/drag-dots.svg') 50% 50% no-repeat;
 }
 
-.blueprint-section-field {
+.blueprint-tab-field {
     @apply relative mb-2 px-1 z-10 outline-none;
 
-    .blueprint-section-field-inner {
+    .blueprint-tab-field-inner {
         @apply relative border rounded bg-gray-200 shadow-sm flex outline-none z-10;
     }
 
@@ -38,11 +38,11 @@
 
 /*  Use specific selector because we don't want it to happen */
 /*  when used inside  a grid field configuratormajig. */
-.blueprint-section .blueprint-section-field-actions > div {
+.blueprint-tab .blueprint-tab-field-actions > div {
     @apply w-1/2;
 }
 
-.blueprint-section-import {
+.blueprint-tab-import {
     &:before {
         content: '';
         @apply border rounded absolute bg-gray-200 shadow-sm;
@@ -52,14 +52,14 @@
 
 /*  These are applied here rather than the utility classes so they don't override */
 /*  the inline widths defined by the draggable library. */
-.blueprint-section-field-w-1\/4 { @apply w-1/4 };
-.blueprint-section-field-w-1\/3 { @apply w-1/3 };
-.blueprint-section-field-w-1\/2 { @apply w-1/2 };
-.blueprint-section-field-w-2\/3 { @apply w-2/3 };
-.blueprint-section-field-w-3\/4 { @apply w-3/4 };
-.blueprint-section-field-w-full { @apply w-full };
-
-.blueprint-add-section-container {
+.blueprint-tab-field-w-1\/4 { @apply w-1/4 };
+.blueprint-tab-field-w-1\/3 { @apply w-1/3 };
+.blueprint-tab-field-w-1\/2 { @apply w-1/2 };
+.blueprint-tab-field-w-2\/3 { @apply w-2/3 };
+.blueprint-tab-field-w-3\/4 { @apply w-3/4 };
+.blueprint-tab-field-w-full { @apply w-full };
+
+.blueprint-add-tab-container {
     @apply p-2 flex min-h-40;
 
     .draggable-container--is-dragging & {
@@ -67,18 +67,18 @@
     }
 }
 
-.blueprint-add-section-button {
+.blueprint-add-tab-button {
     @apply relative w-full border border-gray-500 border-dashed rounded flex justify-center items-center text-gray-700;
 
     &:hover {
         @apply border-gray text-gray-950;
     }
 
-    .blueprint-section-draggable-zone {
+    .blueprint-tab-draggable-zone {
         @apply absolute inset-0 p-4;
     }
 
-    .blueprint-section-field {
+    .blueprint-tab-field {
         @apply bg-white;
     }
 }
diff --git a/resources/css/components/configure.css b/resources/css/components/configure.css
index e4ead17eafe..9cdbb920d3a 100644
--- a/resources/css/components/configure.css
+++ b/resources/css/components/configure.css
@@ -2,7 +2,7 @@
    CONFIGURE COMPONENT: A variation of the publish component
    ========================================================================== */
 
-   .configure-section {
+   .configure-tab {
        .publish-fields .form-group:not(:last-child) {
            @apply border-b;
        }
diff --git a/resources/css/components/preview.css b/resources/css/components/preview.css
index bd2e6920efc..aa4ecd1613c 100644
--- a/resources/css/components/preview.css
+++ b/resources/css/components/preview.css
@@ -39,7 +39,7 @@
     @apply bg-gray-300;
 }
 
-.live-preview .publish-section-actions-footer {
+.live-preview .publish-tab-actions-footer {
     display: none;
 }
 
@@ -95,18 +95,18 @@
 /*  We only want the animation to happen when its on the regular publish page. */
 /*  When portal-ed into live preview, it won't be inside .workspace */
 .workspace {
-    .live-preview-sections-drop-enter-active,
-    .live-preview-sections-drop-leave-active {
+    .live-preview-tabs-drop-enter-active,
+    .live-preview-tabs-drop-leave-active {
         transition: all 0.2s;
     }
-    .live-preview-sections-drop-enter-active {
+    .live-preview-tabs-drop-enter-active {
         transition-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1.275)
     }
-    .live-preview-sections-drop-leave-active {
+    .live-preview-tabs-drop-leave-active {
         transition-timing-function: cubic-bezier(0.6, -0.28, 0.735, 0.045);
     }
-    .live-preview-sections-drop-enter,
-    .live-preview-sections-drop-leave-to {
+    .live-preview-tabs-drop-enter,
+    .live-preview-tabs-drop-leave-to {
         transform: translateY(100px);
         opacity: 0;
     }
@@ -121,7 +121,7 @@
     @apply p-6 bg-gray-300;
 }
 
-/*  remove shadow of sections when its narrow enough to be no longer be displayed as sections. */
-.live-preview-fields-narrow .publish-section {
+/*  remove shadow of tabs when its narrow enough to be no longer be displayed as tabs. */
+.live-preview-fields-narrow .publish-tab {
     @apply shadow-none
 }
diff --git a/resources/css/components/publish.css b/resources/css/components/publish.css
index 3c8d4e93ae4..52912c183b4 100644
--- a/resources/css/components/publish.css
+++ b/resources/css/components/publish.css
@@ -81,7 +81,7 @@ code.parent-url {
     margin-left: 20px;
     width: 300px;
 
-    .publish-section-actions {
+    .publish-tab-actions {
         @apply border-b;
     }
 
@@ -90,7 +90,7 @@ code.parent-url {
     }
 }
 
-.publish-section-actions-footer {
+.publish-tab-actions-footer {
     @apply mt-6;
 }
 
@@ -100,6 +100,6 @@ code.parent-url {
     z-index: 1000;
 }
 
-.publish-section:not(:empty) {
+.publish-tab:not(:empty) {
     @apply shadow bg-white rounded-md w-full;
 }
diff --git a/resources/js/bootstrap/components.js b/resources/js/bootstrap/components.js
index e79349bcdec..470be73ed7d 100644
--- a/resources/js/bootstrap/components.js
+++ b/resources/js/bootstrap/components.js
@@ -10,8 +10,8 @@ import Fields from '../components/publish/Fields.vue';
 import FieldsContainer from '../components/publish/FieldsContainer.vue'; // deprecated
 import Field from '../components/publish/Field.vue';
 import FieldMeta from '../components/publish/FieldMeta.vue';
-import ConfigureSections from '../components/configure/Sections.vue';
-import PublishSections from '../components/publish/Sections.vue';
+import ConfigureTabs from '../components/configure/Tabs.vue';
+import PublishTabs from '../components/publish/Tabs.vue';
 import PublishValidationErrors from '../components/publish/ValidationErrors.vue';
 import FormGroup from '../components/publish/FormGroup.vue';
 import LivePreview from '../components/live-preview/LivePreview.vue';
@@ -77,8 +77,8 @@ Vue.component('publish-fields', Fields);
 Vue.component('publish-fields-container', FieldsContainer);
 Vue.component('publish-field', Field);
 Vue.component('publish-field-meta', FieldMeta);
-Vue.component('configure-sections', ConfigureSections);
-Vue.component('publish-sections', PublishSections);
+Vue.component('configure-tabs', ConfigureTabs);
+Vue.component('publish-tabs', PublishTabs);
 Vue.component('publish-validation-errors', PublishValidationErrors);
 Vue.component('form-group', FormGroup);
 
diff --git a/resources/js/components/asset-containers/CreateForm.vue b/resources/js/components/asset-containers/CreateForm.vue
index 6cce292344b..cd6e77e029b 100644
--- a/resources/js/components/asset-containers/CreateForm.vue
+++ b/resources/js/components/asset-containers/CreateForm.vue
@@ -23,7 +23,7 @@
                 <button type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
             </div>
 
-            <configure-sections @updated="setFieldValue" :enable-sidebar="false"/>
+            <configure-tabs @updated="setFieldValue" :enable-sidebar="false"/>
         </div>
     </publish-container>
 
diff --git a/resources/js/components/asset-containers/EditForm.vue b/resources/js/components/asset-containers/EditForm.vue
index c1a6b8498c5..edc659ab3bf 100644
--- a/resources/js/components/asset-containers/EditForm.vue
+++ b/resources/js/components/asset-containers/EditForm.vue
@@ -12,7 +12,7 @@
         @updated="values = $event"
     >
         <div slot-scope="{ setFieldValue }">
-            <configure-sections @updated="setFieldValue" :enable-sidebar="false"/>
+            <configure-tabs @updated="setFieldValue" :enable-sidebar="false"/>
             <div class="py-4 border-t flex justify-between">
                 <a :href="url" class="btn" v-text="__('Cancel') "/>
                 <button type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
diff --git a/resources/js/components/assets/Editor/Editor.vue b/resources/js/components/assets/Editor/Editor.vue
index 9848e728fcc..54951a8a0b3 100644
--- a/resources/js/components/assets/Editor/Editor.vue
+++ b/resources/js/components/assets/Editor/Editor.vue
@@ -307,8 +307,8 @@ export default {
                 this.actions = data.actions;
 
                 this.fieldset = data.blueprint;
-                this.fields = _.chain(this.fieldset.sections)
-                    .map(section => section.fields)
+                this.fields = _.chain(this.fieldset.tabs)
+                    .map(tab => tab.fields)
                     .flatten(true)
                     .value();
 
diff --git a/resources/js/components/blueprints/Builder.vue b/resources/js/components/blueprints/Builder.vue
index 05ef83c09d1..1f7b20eb211 100644
--- a/resources/js/components/blueprints/Builder.vue
+++ b/resources/js/components/blueprints/Builder.vue
@@ -29,18 +29,18 @@
             </div>
         </div>
 
-        <div class="content mt-10 mb-4" v-if="useSections">
-            <h2>{{ __('Tab Sections') }}</h2>
-            <p class="max-w-lg">{{ __('messages.tab_sections_instructions') }}</p>
-            <div v-if="errors.sections">
-                <small class="help-block text-red" v-for="(error, i) in errors.sections" :key="i" v-text="error" />
+        <div class="content mt-10 mb-4" v-if="useTabs">
+            <h2>{{ __('Tabs') }}</h2>
+            <p class="max-w-lg">{{ __('messages.tabs_instructions') }}</p>
+            <div v-if="errors.tabs">
+                <small class="help-block text-red" v-for="(error, i) in errors.tabs" :key="i" v-text="error" />
             </div>
         </div>
 
-        <sections
-            :single-section="!useSections"
-            :initial-sections="blueprint.sections"
-            @updated="sectionsUpdated"
+        <tabs
+            :single-tab="!useTabs"
+            :initial-tabs="blueprint.tabs"
+            @updated="tabsUpdated"
         />
 
     </div>
@@ -48,26 +48,26 @@
 </template>
 
 <script>
-import Sections from './Sections.vue';
+import Tabs from './Tabs.vue';
 
 export default {
 
     components: {
-        Sections,
+        Tabs,
     },
 
     props: {
         action: String,
         initialBlueprint: Object,
         showTitle: Boolean,
-        useSections: { type: Boolean, default: true },
+        useTabs: { type: Boolean, default: true },
         isFormBlueprint: { type: Boolean, default: false },
     },
 
     data() {
         return {
             blueprint: this.initializeBlueprint(),
-            sections: [],
+            tabs: [],
             errors: {}
         }
     },
@@ -85,8 +85,8 @@ export default {
 
     watch: {
 
-        sections(sections) {
-            this.blueprint.sections = sections;
+        tabs(tabs) {
+            this.blueprint.tabs = tabs;
         },
 
         blueprint: {
@@ -108,8 +108,8 @@ export default {
             return blueprint;
         },
 
-        sectionsUpdated(sections) {
-            this.sections = sections;
+        tabsUpdated(tabs) {
+            this.tabs = tabs;
         },
 
         save() {
diff --git a/resources/js/components/blueprints/Field.vue b/resources/js/components/blueprints/Field.vue
index f73b2694991..0f9789eaaca 100644
--- a/resources/js/components/blueprints/Field.vue
+++ b/resources/js/components/blueprints/Field.vue
@@ -11,7 +11,7 @@ export default {
             default: true
         },
         isEditing: Boolean,
-        isSectionExpanded: Boolean
+        isTabExpanded: Boolean
     }
 
 }
diff --git a/resources/js/components/blueprints/Fields.vue b/resources/js/components/blueprints/Fields.vue
index 82accf41afb..f32b8f13bbe 100644
--- a/resources/js/components/blueprints/Fields.vue
+++ b/resources/js/components/blueprints/Fields.vue
@@ -2,7 +2,7 @@
 
     <div class="flex flex-col text-sm">
 
-        <div class="blueprint-section-draggable-zone -mx-1"
+        <div class="blueprint-tab-draggable-zone -mx-1"
             :class="{ 'flex flex-wrap flex-1': fields.length }"
         >
             <slot name="empty-state" v-if="!fields.length" />
@@ -13,7 +13,7 @@
                 :key="field._id"
                 :field="field"
                 :is-editing="editingField === field._id"
-                :is-section-expanded="isSectionExpanded"
+                :is-tab-expanded="isTabExpanded"
                 :suggestable-condition-fields="suggestableConditionFields"
                 :can-define-localizable="canDefineLocalizable"
                 @edit="$emit('field-editing', field._id)"
@@ -23,7 +23,7 @@
             />
         </div>
 
-        <div class="blueprint-section-field-actions flex mt-2 -mx-1">
+        <div class="blueprint-tab-field-actions flex mt-2 -mx-1">
             <div class="px-1">
                 <link-fields
                     :exclude-fieldset="excludeFieldset"
@@ -88,7 +88,7 @@ export default {
     props: {
         fields: Array,
         editingField: {},
-        isSectionExpanded: Boolean,
+        isTabExpanded: Boolean,
         suggestableConditionFields: Array,
         excludeFieldset: String,
     },
diff --git a/resources/js/components/blueprints/ImportField.vue b/resources/js/components/blueprints/ImportField.vue
index 190370e4aa5..2d5f9f8cddc 100644
--- a/resources/js/components/blueprints/ImportField.vue
+++ b/resources/js/components/blueprints/ImportField.vue
@@ -1,7 +1,7 @@
 <template>
 
-    <div class="blueprint-section-field blueprint-section-import blueprint-section-field-w-full">
-        <div class="blueprint-section-field-inner">
+    <div class="blueprint-tab-field blueprint-tab-import blueprint-tab-field-w-full">
+        <div class="blueprint-tab-field-inner">
             <div class="blueprint-drag-handle w-4 border-r"></div>
             <div class="flex flex-1 items-center justify-between">
                 <div class="flex items-center flex-1 pr-4 py-2 pl-2">
diff --git a/resources/js/components/blueprints/RegularField.vue b/resources/js/components/blueprints/RegularField.vue
index fc34e292268..00b06c6908d 100644
--- a/resources/js/components/blueprints/RegularField.vue
+++ b/resources/js/components/blueprints/RegularField.vue
@@ -1,7 +1,7 @@
 <template>
 
-    <div class="blueprint-section-field" :class="widthClass">
-        <div class="blueprint-section-field-inner">
+    <div class="blueprint-tab-field" :class="widthClass">
+        <div class="blueprint-tab-field-inner">
             <div class="blueprint-drag-handle w-4 border-r"></div>
             <div class="flex flex-1 items-center justify-between">
                 <div class="flex items-center flex-1 pr-4 py-2 pl-2">
@@ -111,7 +111,7 @@ export default {
         },
 
         widthClass() {
-            if (! this.isSectionExpanded) return 'w-full';
+            if (! this.isTabExpanded) return 'w-full';
 
             return `${tailwind_width_class(this.width)}`;
         },
diff --git a/resources/js/components/blueprints/Sections.vue b/resources/js/components/blueprints/Sections.vue
deleted file mode 100644
index 4dd91c2563d..00000000000
--- a/resources/js/components/blueprints/Sections.vue
+++ /dev/null
@@ -1,202 +0,0 @@
-<template>
-
-    <div>
-
-        <div ref="sections" class="blueprint-sections flex flex-wrap -mx-2 outline-none">
-
-            <blueprint-section
-                ref="section"
-                v-for="(section, i) in sections"
-                :key="section._id"
-                :section="section"
-                :is-single="singleSection"
-                :can-define-localizable="canDefineLocalizable"
-                :deletable="isSectionDeletable(i)"
-                @updated="updateSection(i, $event)"
-                @deleted="deleteSection(i)"
-            />
-
-            <div class="blueprint-add-section-container w-full md:w-1/2" v-if="!singleSection">
-                <button class="blueprint-add-section-button outline-none" @click="addSection">
-                    <div class="text-center flex items-center leading-none">
-                        <div class="text-2xl mr-2">+</div>
-                        <div v-text="addSectionText" />
-                    </div>
-
-                    <div class="blueprint-section-draggable-zone outline-none"></div>
-                </button>
-            </div>
-
-        </div>
-
-    </div>
-
-</template>
-
-<script>
-import uniqid from 'uniqid';
-import BlueprintSection from './Section.vue';
-import {Sortable, Plugins} from '@shopify/draggable';
-import CanDefineLocalizable from '../fields/CanDefineLocalizable';
-
-let sortableSections, sortableFields;
-
-export default {
-
-    mixins: [CanDefineLocalizable],
-
-    components: {
-        BlueprintSection
-    },
-
-    props: {
-        initialSections: {
-            type: Array,
-            required: true
-        },
-        addSectionText: {
-            type: String,
-            default: () => __('Add Section')
-        },
-        newSectionText: {
-            type: String,
-            default: () => __('New Section')
-        },
-        singleSection: {
-            type: Boolean,
-            default: false
-        },
-        requireSection: {
-            type: Boolean,
-            default: true
-        }
-    },
-
-    data() {
-        return {
-            sections: this.initialSections
-        }
-    },
-
-    mounted() {
-        this.ensureSection();
-        this.makeSortable();
-    },
-
-    watch: {
-
-        sections(sections) {
-            this.$emit('updated', sections);
-            this.makeSortable();
-        }
-
-    },
-
-    methods: {
-
-        makeSortable() {
-            if (! this.singleSection) this.makeSectionsSortable();
-
-            this.makeFieldsSortable();
-        },
-
-        makeSectionsSortable() {
-            if (sortableSections) sortableSections.destroy();
-
-            sortableSections = new Sortable(this.$refs.sections, {
-                draggable: '.blueprint-section',
-                handle: '.blueprint-section-drag-handle',
-                mirror: { constrainDimensions: true },
-                swapAnimation: { horizontal: true },
-                plugins: [Plugins.SwapAnimation]
-            }).on('sortable:stop', e => {
-                this.sections.splice(e.newIndex, 0, this.sections.splice(e.oldIndex, 1)[0]);
-            });
-        },
-
-        makeFieldsSortable() {
-            if (sortableFields) sortableFields.destroy();
-
-            sortableFields = new Sortable(document.querySelectorAll('.blueprint-section-draggable-zone'), {
-                draggable: '.blueprint-section-field',
-                handle: '.blueprint-drag-handle',
-                mirror: { constrainDimensions: true },
-                plugins: [Plugins.SwapAnimation]
-            }).on('sortable:stop', e => {
-                if (e.newContainer.parentElement.classList.contains('blueprint-add-section-button')) {
-                    this.moveFieldToNewSection(e);
-                } else {
-                    this.moveFieldToExistingSection(e);
-                }
-            });
-        },
-
-        moveFieldToExistingSection(e) {
-            const oldSectionIndex = Array.prototype.indexOf.call(this.$refs.sections.children, e.oldContainer.closest('.blueprint-section'));
-            const newSectionIndex = Array.prototype.indexOf.call(this.$refs.sections.children, e.newContainer.closest('.blueprint-section'));
-            const field = this.sections[oldSectionIndex].fields[e.oldIndex];
-
-            if (oldSectionIndex === newSectionIndex) {
-                let fields = this.sections[newSectionIndex].fields
-                fields.splice(e.newIndex, 0, fields.splice(e.oldIndex, 1)[0]);
-            } else {
-                this.sections[newSectionIndex].fields.splice(e.newIndex, 0, field);
-                this.sections[oldSectionIndex].fields.splice(e.oldIndex, 1);
-            }
-        },
-
-        moveFieldToNewSection(e) {
-            this.addSection();
-
-            const newSectionIndex = this.sections.length - 1;
-            const oldSectionIndex = Array.prototype.indexOf.call(this.$refs.sections.children, e.oldContainer.closest('.blueprint-section'));
-            const field = this.sections[oldSectionIndex].fields[e.oldIndex];
-
-            this.sections[newSectionIndex].fields.splice(e.newIndex, 0, field);
-            this.sections[oldSectionIndex].fields.splice(e.oldIndex, 1);
-
-            this.$nextTick(() => this.makeFieldsSortable());
-        },
-
-        addSection() {
-            this.sections.push({
-                _id: uniqid(),
-                display: this.newSectionText,
-                handle: this.$slugify(this.newSectionText, '_'),
-                fields: []
-            });
-
-            this.$nextTick(() => {
-                this.$refs.section[this.sections.length-1].focus();
-                this.makeSortable();
-            })
-        },
-
-        deleteSection(i) {
-            this.sections.splice(i, 1);
-
-            this.ensureSection();
-        },
-
-        updateSection(i, section) {
-            this.sections.splice(i, 1, section);
-        },
-
-        ensureSection() {
-            if (this.requireSection && this.sections.length === 0) {
-                this.addSection();
-            }
-        },
-
-        isSectionDeletable(i) {
-            if (this.sections.length > 1) return true;
-
-            if (i > 0) return true;
-
-            return !this.requireSection;
-        }
-
-    }
-
-}
-</script>
diff --git a/resources/js/components/blueprints/Section.vue b/resources/js/components/blueprints/Tab.vue
similarity index 76%
rename from resources/js/components/blueprints/Section.vue
rename to resources/js/components/blueprints/Tab.vue
index 4580a9b930a..f8068b32d8c 100644
--- a/resources/js/components/blueprints/Section.vue
+++ b/resources/js/components/blueprints/Tab.vue
@@ -1,21 +1,21 @@
 <template>
 
-    <div class="blueprint-section @container"
+    <div class="blueprint-tab @container"
         :class="{
             'w-full md:w-1/2': !isEditing && !isSingle,
             'w-full': isEditing || isSingle
         }"
     >
-        <div class="blueprint-section-card card p-0 h-full flex rounded-t flex-col">
+        <div class="blueprint-tab-card card p-0 h-full flex rounded-t flex-col">
 
             <div class="bg-gray-200 border-b text-sm flex rounded-t" v-if="!isSingle">
-                <div class="blueprint-drag-handle blueprint-section-drag-handle w-4 border-r"></div>
+                <div class="blueprint-drag-handle blueprint-tab-drag-handle w-4 border-r"></div>
                 <div class="p-3 py-2 flex-1">
                     <span class="font-medium mr-2">
-                        <input ref="displayInput" type="text" v-model="section.display" class="bg-transparent w-full outline-none" />
+                        <input ref="displayInput" type="text" v-model="tab.display" class="bg-transparent w-full outline-none" />
                     </span>
                     <span class="font-mono text-xs text-gray-700 mr-2">
-                        <input type="text" v-model="section.handle" @input="handleSyncedWithDisplay = false" class="bg-transparent w-full outline-none" />
+                        <input type="text" v-model="tab.handle" @input="handleSyncedWithDisplay = false" class="bg-transparent w-full outline-none" />
                     </span>
                 </div>
                 <div class="flex items-center px-3">
@@ -31,9 +31,9 @@
 
             <fields
                 class="p-4"
-                :fields="section.fields"
+                :fields="tab.fields"
                 :editing-field="editingField"
-                :is-section-expanded="isEditing || isSingle"
+                :is-tab-expanded="isEditing || isSingle"
                 :suggestable-condition-fields="suggestableConditionFields"
                 :can-define-localizable="canDefineLocalizable"
                 @field-created="fieldCreated"
@@ -69,7 +69,7 @@ export default {
     },
 
     props: {
-        section: {
+        tab: {
             type: Object,
             required: true
         },
@@ -93,22 +93,22 @@ export default {
 
     computed: {
         suggestableConditionFields() {
-            return this.section.fields.map(field => field.handle);
+            return this.tab.fields.map(field => field.handle);
         }
     },
 
     watch: {
 
-        section: {
+        tab: {
             deep: true,
-            handler(section) {
-                this.$emit('updated', section);
+            handler(tab) {
+                this.$emit('updated', tab);
             }
         },
 
-        'section.display': function(display) {
+        'tab.display': function(display) {
             if (this.handleSyncedWithDisplay) {
-                this.section.handle = this.$slugify(display, '_');
+                this.tab.handle = this.$slugify(display, '_');
             }
         }
 
@@ -117,7 +117,7 @@ export default {
     created() {
         // This logic isn't ideal, but it was better than passing along a 'isNew' boolean and having
         // to deal with stripping it out and making it not new, etc. Good enough for a quick win.
-        if (!this.section.handle || this.section.handle == 'new_section' || this.section.handle == 'new_set') {
+        if (!this.tab.handle || this.tab.handle == 'new_tab' || this.tab.handle == 'new_set') {
             this.handleSyncedWithDisplay = true;
         }
     },
@@ -125,7 +125,7 @@ export default {
     methods: {
 
         fieldLinked(field) {
-            this.section.fields.push(field);
+            this.tab.fields.push(field);
             this.$toast.success(__('Field added'));
 
             if (field.type === 'reference') {
@@ -134,15 +134,15 @@ export default {
         },
 
         fieldCreated(field) {
-            this.section.fields.push(field);
+            this.tab.fields.push(field);
         },
 
         fieldUpdated(i, field) {
-            this.section.fields.splice(i, 1, field);
+            this.tab.fields.splice(i, 1, field);
         },
 
         deleteField(i) {
-            this.section.fields.splice(i, 1);
+            this.tab.fields.splice(i, 1);
         },
 
         focus() {
diff --git a/resources/js/components/blueprints/SectionSettings.vue b/resources/js/components/blueprints/TabSettings.vue
similarity index 86%
rename from resources/js/components/blueprints/SectionSettings.vue
rename to resources/js/components/blueprints/TabSettings.vue
index e95a510c79b..e01bfe7060d 100644
--- a/resources/js/components/blueprints/SectionSettings.vue
+++ b/resources/js/components/blueprints/TabSettings.vue
@@ -3,7 +3,7 @@
     <div class="flex flex-col h-full">
 
         <div class="flex items-center p-6 bg-gray-200 border-b text-center">
-            Section
+            {{ __('Tabs') }}
         </div>
 
         <div class="flex-1 overflow-scroll">
@@ -13,9 +13,9 @@
                     <div
                         v-for="field in fields"
                         :key="field._id"
-                        class="blueprint-section-field"
+                        class="blueprint-tab-field"
                     >
-                        <div class="blueprint-section-field-inner">
+                        <div class="blueprint-tab-field-inner">
                             <div class="blueprint-drag-handle w-4 border-r"></div>
 
                             <label class="block">{{ field.display }}</label>
@@ -39,12 +39,12 @@ export default {
     components: { PublishField },
 
     props: {
-        section: Object
+        tab: Object
     },
 
     computed: {
         fields() {
-            return this.section.fields.map(field => {
+            return this.tab.fields.map(field => {
                 const config = field.config || {};
 
                 return {
diff --git a/resources/js/components/blueprints/Tabs.vue b/resources/js/components/blueprints/Tabs.vue
new file mode 100644
index 00000000000..79526776e6b
--- /dev/null
+++ b/resources/js/components/blueprints/Tabs.vue
@@ -0,0 +1,202 @@
+<template>
+
+    <div>
+
+        <div ref="tabs" class="blueprint-tabs flex flex-wrap -mx-2 outline-none">
+
+            <blueprint-tab
+                ref="tab"
+                v-for="(tab, i) in tabs"
+                :key="tab._id"
+                :tab="tab"
+                :is-single="singleTab"
+                :can-define-localizable="canDefineLocalizable"
+                :deletable="isTabDeletable(i)"
+                @updated="updateTab(i, $event)"
+                @deleted="deleteTab(i)"
+            />
+
+            <div class="blueprint-add-tab-container w-full md:w-1/2" v-if="!singleTab">
+                <button class="blueprint-add-tab-button outline-none" @click="addTab">
+                    <div class="text-center flex items-center leading-none">
+                        <div class="text-2xl mr-2">+</div>
+                        <div v-text="addTabText" />
+                    </div>
+
+                    <div class="blueprint-tab-draggable-zone outline-none"></div>
+                </button>
+            </div>
+
+        </div>
+
+    </div>
+
+</template>
+
+<script>
+import uniqid from 'uniqid';
+import BlueprintTab from './Tab.vue';
+import {Sortable, Plugins} from '@shopify/draggable';
+import CanDefineLocalizable from '../fields/CanDefineLocalizable';
+
+let sortableTabs, sortableFields;
+
+export default {
+
+    mixins: [CanDefineLocalizable],
+
+    components: {
+        BlueprintTab
+    },
+
+    props: {
+        initialTabs: {
+            type: Array,
+            required: true
+        },
+        addTabText: {
+            type: String,
+            default: () => __('Add Tab')
+        },
+        newTabText: {
+            type: String,
+            default: () => __('New Tab')
+        },
+        singleTab: {
+            type: Boolean,
+            default: false
+        },
+        requireTab: {
+            type: Boolean,
+            default: true
+        }
+    },
+
+    data() {
+        return {
+            tabs: this.initialTabs
+        }
+    },
+
+    mounted() {
+        this.ensureTab();
+        this.makeSortable();
+    },
+
+    watch: {
+
+        tabs(tabs) {
+            this.$emit('updated', tabs);
+            this.makeSortable();
+        }
+
+    },
+
+    methods: {
+
+        makeSortable() {
+            if (! this.singleTab) this.makeTabsSortable();
+
+            this.makeFieldsSortable();
+        },
+
+        makeTabsSortable() {
+            if (sortableTabs) sortableTabs.destroy();
+
+            sortableTabs = new Sortable(this.$refs.tabs, {
+                draggable: '.blueprint-tab',
+                handle: '.blueprint-tab-drag-handle',
+                mirror: { constrainDimensions: true },
+                swapAnimation: { horizontal: true },
+                plugins: [Plugins.SwapAnimation]
+            }).on('sortable:stop', e => {
+                this.tabs.splice(e.newIndex, 0, this.tabs.splice(e.oldIndex, 1)[0]);
+            });
+        },
+
+        makeFieldsSortable() {
+            if (sortableFields) sortableFields.destroy();
+
+            sortableFields = new Sortable(document.querySelectorAll('.blueprint-tab-draggable-zone'), {
+                draggable: '.blueprint-tab-field',
+                handle: '.blueprint-drag-handle',
+                mirror: { constrainDimensions: true },
+                plugins: [Plugins.SwapAnimation]
+            }).on('sortable:stop', e => {
+                if (e.newContainer.parentElement.classList.contains('blueprint-add-tab-button')) {
+                    this.moveFieldToNewTab(e);
+                } else {
+                    this.moveFieldToExistingTab(e);
+                }
+            });
+        },
+
+        moveFieldToExistingTab(e) {
+            const oldTabIndex = Array.prototype.indexOf.call(this.$refs.tabs.children, e.oldContainer.closest('.blueprint-tab'));
+            const newTabIndex = Array.prototype.indexOf.call(this.$refs.tabs.children, e.newContainer.closest('.blueprint-tab'));
+            const field = this.tabs[oldTabIndex].fields[e.oldIndex];
+
+            if (oldTabIndex === newTabIndex) {
+                let fields = this.tabs[newTabIndex].fields
+                fields.splice(e.newIndex, 0, fields.splice(e.oldIndex, 1)[0]);
+            } else {
+                this.tabs[newTabIndex].fields.splice(e.newIndex, 0, field);
+                this.tabs[oldTabIndex].fields.splice(e.oldIndex, 1);
+            }
+        },
+
+        moveFieldToNewTab(e) {
+            this.addTab();
+
+            const newTabIndex = this.tabs.length - 1;
+            const oldTabIndex = Array.prototype.indexOf.call(this.$refs.tabs.children, e.oldContainer.closest('.blueprint-tab'));
+            const field = this.tabs[oldTabIndex].fields[e.oldIndex];
+
+            this.tabs[newTabIndex].fields.splice(e.newIndex, 0, field);
+            this.tabs[oldTabIndex].fields.splice(e.oldIndex, 1);
+
+            this.$nextTick(() => this.makeFieldsSortable());
+        },
+
+        addTab() {
+            this.tabs.push({
+                _id: uniqid(),
+                display: this.newTabText,
+                handle: this.$slugify(this.newTabText, '_'),
+                fields: []
+            });
+
+            this.$nextTick(() => {
+                this.$refs.tab[this.tabs.length-1].focus();
+                this.makeSortable();
+            })
+        },
+
+        deleteTab(i) {
+            this.tabs.splice(i, 1);
+
+            this.ensureTab();
+        },
+
+        updateTab(i, tab) {
+            this.tabs.splice(i, 1, tab);
+        },
+
+        ensureTab() {
+            if (this.requireTab && this.tabs.length === 0) {
+                this.addTab();
+            }
+        },
+
+        isTabDeletable(i) {
+            if (this.tabs.length > 1) return true;
+
+            if (i > 0) return true;
+
+            return !this.requireTab;
+        }
+
+    }
+
+}
+</script>
diff --git a/resources/js/components/collections/EditForm.vue b/resources/js/components/collections/EditForm.vue
index ffe570f2322..fe231fc7cec 100644
--- a/resources/js/components/collections/EditForm.vue
+++ b/resources/js/components/collections/EditForm.vue
@@ -19,7 +19,7 @@
                     <button type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
                 </div>
             </header>
-            <configure-sections
+            <configure-tabs
                 @updated="setFieldValue"
                 @meta-updated="setFieldMeta"
                 :enable-sidebar="false"/>
diff --git a/resources/js/components/configure/Sections.vue b/resources/js/components/configure/Tabs.vue
similarity index 66%
rename from resources/js/components/configure/Sections.vue
rename to resources/js/components/configure/Tabs.vue
index 5819ba01174..5ac015f6892 100644
--- a/resources/js/components/configure/Sections.vue
+++ b/resources/js/components/configure/Tabs.vue
@@ -1,14 +1,14 @@
 <template>
     <element-container @resized="containerWidth = $event.width">
         <div>
-            <div v-for="section in mainSections" :key="section.handle">
+            <div v-for="tab in mainTabs" :key="tab.handle">
                 <div class="mb-2 content">
-                    <h2 v-text="section.display" class="text-base" />
-                    <p v-html="section.instructions" />
+                    <h2 v-text="tab.display" class="text-base" />
+                    <p v-html="tab.instructions" />
                 </div>
-                <div class="card p-0 mb-10 configure-section">
+                <div class="card p-0 mb-10 configure-tab">
                     <publish-fields
-                        :fields="section.fields"
+                        :fields="tab.fields"
                         :read-only="readOnly"
                         :syncable="syncable"
                         @updated="(handle, value) => $emit('updated', handle, value)"
@@ -21,7 +21,7 @@
                 </div>
             </div>
 
-            <portal-target :name="actionsPortal" class="publish-section publish-section-actions-footer" />
+            <portal-target :name="actionsPortal" class="publish-tab publish-tab-actions-footer" />
         </div>
     </element-container>
 </template>
@@ -40,7 +40,7 @@ export default {
         const state = this.$store.state.publish[this.storeName];
 
         return {
-            active: state.blueprint.sections[0].handle,
+            active: state.blueprint.tabs[0].handle,
             containerWidth: null
         }
     },
@@ -51,18 +51,18 @@ export default {
             return this.$store.state.publish[this.storeName];
         },
 
-        sections() {
-            return this.state.blueprint.sections;
+        tabs() {
+            return this.state.blueprint.tabs;
         },
 
-        mainSections() {
-            if (! this.shouldShowSidebar) return this.sections;
+        mainTabs() {
+            if (! this.shouldShowSidebar) return this.tabs;
 
             if (this.active === "sidebar") {
-                this.active = this.state.blueprint.sections[0].handle
+                this.active = this.state.blueprint.tabs[0].handle
             }
 
-            return _.filter(this.sections, section => section.handle != 'sidebar');
+            return _.filter(this.tabs, tab => tab.handle != 'sidebar');
         },
 
         actionsPortal() {
diff --git a/resources/js/components/data-list/Action.vue b/resources/js/components/data-list/Action.vue
index fbf6596b468..e006847cfd6 100644
--- a/resources/js/components/data-list/Action.vue
+++ b/resources/js/components/data-list/Action.vue
@@ -63,7 +63,7 @@ export default {
     data() {
         return {
             confirming: false,
-            fieldset: {sections:[{fields:this.action.fields}]},
+            fieldset: {tabs:[{fields:this.action.fields}]},
             values: this.action.values,
         }
     },
diff --git a/resources/js/components/entries/PublishForm.vue b/resources/js/components/entries/PublishForm.vue
index 9198f1d5c35..6800b4537be 100644
--- a/resources/js/components/entries/PublishForm.vue
+++ b/resources/js/components/entries/PublishForm.vue
@@ -84,9 +84,9 @@
                         v-on="component.events"
                     />
 
-                    <transition name="live-preview-sections-drop">
-                        <publish-sections
-                            v-show="sectionsVisible"
+                    <transition name="live-preview-tabs-drop">
+                        <publish-tabs
+                            v-show="tabsVisible"
                             :read-only="readOnly"
                             :syncable="hasOrigin"
                             :can-toggle-labels="true"
@@ -181,7 +181,7 @@
                                 </div>
 
                             </template>
-                        </publish-sections>
+                        </publish-tabs>
                     </transition>
                 </div>
                 <template v-slot:buttons>
@@ -356,7 +356,7 @@ export default {
             error: null,
             errors: {},
             isPreviewing: false,
-            sectionsVisible: true,
+            tabsVisible: true,
             state: 'new',
             revisionMessage: null,
             showRevisionHistory: false,
@@ -679,18 +679,18 @@ export default {
         },
 
         openLivePreview() {
-            this.sectionsVisible = false;
+            this.tabsVisible = false;
             this.$wait(200)
                 .then(() => {
                     this.isPreviewing = true;
                     return this.$wait(300);
                 })
-                .then(() => this.sectionsVisible = true);
+                .then(() => this.tabsVisible = true);
         },
 
         closeLivePreview() {
             this.isPreviewing = false;
-            this.sectionsVisible = true;
+            this.tabsVisible = true;
         },
 
         publishActionCompleted({ published, isWorkingCopy, response }) {
diff --git a/resources/js/components/fields/Settings.vue b/resources/js/components/fields/Settings.vue
index c0f1305eaed..9f76405eb11 100644
--- a/resources/js/components/fields/Settings.vue
+++ b/resources/js/components/fields/Settings.vue
@@ -58,9 +58,9 @@
                 <div v-show="activeTab === 'settings'" slot-scope="{ setFieldValue, setFieldMeta }">
 
                     <publish-fields
-                        v-if="blueprint.sections.length"
+                        v-if="blueprint.tabs.length"
                         class="w-full"
-                        :fields="blueprint.sections[0].fields"
+                        :fields="blueprint.tabs[0].fields"
                         @updated="(handle, value) => {
                             updateField(handle, value, setFieldValue);
                             if (handle === 'handle') isHandleModified = true
diff --git a/resources/js/components/fieldsets/EditForm.vue b/resources/js/components/fieldsets/EditForm.vue
index 8c5a16d06f7..809f943dd71 100644
--- a/resources/js/components/fieldsets/EditForm.vue
+++ b/resources/js/components/fieldsets/EditForm.vue
@@ -32,7 +32,7 @@
                 :fields="fieldset.fields"
                 :editing-field="editingField"
                 :exclude-fieldset="fieldset.handle"
-                :is-section-expanded="true"
+                :is-tab-expanded="true"
                 @field-created="fieldCreated"
                 @field-updated="fieldUpdated"
                 @field-linked="fieldLinked"
@@ -121,8 +121,8 @@ export default {
         },
 
         makeSortable() {
-            new Sortable(this.$el.querySelector('.blueprint-section-draggable-zone'), {
-                draggable: '.blueprint-section-field',
+            new Sortable(this.$el.querySelector('.blueprint-tab-draggable-zone'), {
+                draggable: '.blueprint-tab-field',
                 handle: '.blueprint-drag-handle',
                 mirror: { constrainDimensions: true },
                 plugins: [Plugins.SwapAnimation]
diff --git a/resources/js/components/fieldtypes/GroupFieldtype.vue b/resources/js/components/fieldtypes/GroupFieldtype.vue
new file mode 100644
index 00000000000..d91b7313fcd
--- /dev/null
+++ b/resources/js/components/fieldtypes/GroupFieldtype.vue
@@ -0,0 +1,30 @@
+<template>
+
+    <div>
+        Group Fieldtype
+    </div>
+
+</template>
+
+<script>
+
+export default {
+
+    mixins: [Fieldtype],
+
+    data() {
+        return {
+
+        }
+    },
+
+    computed: {
+
+
+    },
+
+    methods: {
+
+    },
+}
+</script>
diff --git a/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue b/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue
index 1f1220517b6..9a2dc6edc15 100644
--- a/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue
+++ b/resources/js/components/fieldtypes/grid/FieldsFieldtype.vue
@@ -64,8 +64,8 @@ export default {
         },
 
         makeSortable() {
-            new Sortable(this.$el.querySelector('.blueprint-section-draggable-zone'), {
-                draggable: '.blueprint-section-field',
+            new Sortable(this.$el.querySelector('.blueprint-tab-draggable-zone'), {
+                draggable: '.blueprint-tab-field',
                 handle: '.blueprint-drag-handle',
                 mirror: { constrainDimensions: true },
                 plugins: [Plugins.SwapAnimation]
diff --git a/resources/js/components/fieldtypes/replicator/SetsFieldtype.vue b/resources/js/components/fieldtypes/replicator/SetsFieldtype.vue
index e75b6f3e5f7..7929e635f20 100644
--- a/resources/js/components/fieldtypes/replicator/SetsFieldtype.vue
+++ b/resources/js/components/fieldtypes/replicator/SetsFieldtype.vue
@@ -2,13 +2,13 @@
 
     <div>
 
-        <sections
-            :initial-sections="sections"
-            :require-section="config.require_section"
+        <tabs
+            :initial-tabs="tabs"
+            :require-tab="config.require_tab"
             :can-define-localizable="false"
-            :add-section-text="__('Add Set')"
-            :new-section-text="__('New Set')"
-            @updated="sectionsUpdated"
+            :add-tab-text="__('Add Set')"
+            :new-tab-text="__('New Set')"
+            @updated="tabsUpdated"
         />
 
     </div>
@@ -16,26 +16,26 @@
 </template>
 
 <script>
-import Sections from '../../blueprints/Sections.vue';
+import Tabs from '../../blueprints/Tabs.vue';
 
 export default {
 
     mixins: [Fieldtype],
 
     components: {
-        Sections
+        Tabs
     },
 
     data() {
         return {
-            sections: this.value
+            tabs: this.value
         }
     },
 
     methods: {
 
-        sectionsUpdated(sections) {
-            this.sections = sections;
+        tabsUpdated(tabs) {
+            this.tabs = tabs;
         }
 
     }
diff --git a/resources/js/components/globals/EditForm.vue b/resources/js/components/globals/EditForm.vue
index 59f1ecc6794..20c34046bd6 100644
--- a/resources/js/components/globals/EditForm.vue
+++ b/resources/js/components/globals/EditForm.vue
@@ -12,7 +12,7 @@
         @updated="values = $event"
     >
         <div slot-scope="{ setFieldValue, setFieldMeta }">
-            <configure-sections
+            <configure-tabs
                 @updated="setFieldValue"
                 @meta-updated="setFieldMeta"
                 :enable-sidebar="false"/>
diff --git a/resources/js/components/globals/PublishForm.vue b/resources/js/components/globals/PublishForm.vue
index 9e5dfa8581e..0aff7a0cdcf 100644
--- a/resources/js/components/globals/PublishForm.vue
+++ b/resources/js/components/globals/PublishForm.vue
@@ -65,7 +65,7 @@
                     :container="container"
                     v-bind="component.props"
                 />
-                <publish-sections
+                <publish-tabs
                     :read-only="! canEdit"
                     :syncable="hasOrigin"
                     :can-toggle-labels="true"
diff --git a/resources/js/components/nav/Branch.vue b/resources/js/components/nav/Branch.vue
index 53325f52bb6..b51a1dfddd1 100644
--- a/resources/js/components/nav/Branch.vue
+++ b/resources/js/components/nav/Branch.vue
@@ -3,19 +3,19 @@
     <div class="flex">
         <div class="page-move w-6" />
         <div class="flex items-center flex-1 p-2 ml-2 text-xs leading-normal">
-            <div class="flex items-center flex-1" :class="{ 'opacity-50': isHidden || isInHiddenSection }">
-                <template v-if="! isSection">
+            <div class="flex items-center flex-1" :class="{ 'opacity-50': isHidden || isInHiddenTab }">
+                <template v-if="! isTab">
                     <i v-if="isAlreadySvg" class="w-4 h-4 mr-2" v-html="icon"></i>
                     <svg-icon v-else class="w-4 h-4 mr-2" :name="icon" />
                 </template>
 
                 <a
                     @click="$emit('edit', $event)"
-                    :class="{ 'text-sm font-medium': isSection }"
+                    :class="{ 'text-sm font-medium': isTab }"
                     v-text="__(item.text)" />
 
                 <button
-                    v-if="hasChildren && !isSection"
+                    v-if="hasChildren && !isTab"
                     class="p-2 text-gray-600 hover:text-gray-700 transition duration-100 outline-none flex"
                     :class="{ '-rotate-90': !isOpen }"
                     @click="$emit('toggle-open')"
@@ -36,13 +36,13 @@
             <div class="pr-2 flex items-center">
                 <slot name="branch-icon" :branch="item" />
 
-                <svg-icon v-if="isRenamedSection" class="inline-block w-4 h-4 text-gray-500" name="content-writing" v-tooltip="__('Renamed Section')" />
-                <svg-icon v-else-if="isHidden" class="inline-block w-4 h-4 text-gray-500" name="hidden" v-tooltip="isSection ? __('Hidden Section') : __('Hidden Item')" />
+                <svg-icon v-if="isRenamedTab" class="inline-block w-4 h-4 text-gray-500" name="content-writing" v-tooltip="__('Renamed Tab')" />
+                <svg-icon v-else-if="isHidden" class="inline-block w-4 h-4 text-gray-500" name="hidden" v-tooltip="isTab ? __('Hidden Tab') : __('Hidden Item')" />
                 <svg-icon v-else-if="isPinnedAlias" class="inline-block w-4 h-4 text-gray-500" name="pin" v-tooltip="__('Pinned Item')" />
                 <svg-icon v-else-if="isAlias" class="inline-block w-4 h-4 text-gray-500" name="duplicate-ids" v-tooltip="__('Alias Item')" />
                 <svg-icon v-else-if="isMoved" class="inline-block w-4 text-gray-500" name="flip-vertical" v-tooltip="__('Moved Item')" />
                 <svg-icon v-else-if="isModified" class="inline-block w-4 h-4 text-gray-500" name="content-writing" v-tooltip="__('Modified Item')" />
-                <svg-icon v-else-if="isCustom" class="inline-block w-4 text-gray-500" name="user-edit" v-tooltip="isSection ? __('Custom Section') : __('Custom Item')" />
+                <svg-icon v-else-if="isCustom" class="inline-block w-4 text-gray-500" name="user-edit" v-tooltip="isTab ? __('Custom Tab') : __('Custom Item')" />
 
                 <dropdown-list class="ml-4">
                     <slot name="branch-options"
@@ -65,13 +65,13 @@ export default {
 
     props: {
         item: Object,
-        parentSection: Object,
+        parentTab: Object,
         depth: Number,
         root: Boolean,
         vm: Object,
         isOpen: Boolean,
         hasChildren: Boolean,
-        disableSections: Boolean,
+        disableTabs: Boolean,
         topLevel: Boolean,
     },
 
@@ -83,8 +83,8 @@ export default {
 
     computed: {
 
-        isSection() {
-            if (this.disableSections) {
+        isTab() {
+            if (this.disableTabs) {
                 return false;
             }
 
@@ -103,16 +103,16 @@ export default {
             return this.icon.startsWith('<svg');
         },
 
-        isRenamedSection() {
-            return this.isSection && this.item.text !== data_get(this.item, 'config.display_original');
+        isRenamedTab() {
+            return this.isTab && this.item.text !== data_get(this.item, 'config.display_original');
         },
 
         isHidden() {
             return data_get(this.item, 'manipulations.action') === '@hide';
         },
 
-        isInHiddenSection() {
-            return data_get(this.parentSection, 'manipulations.action') === '@hide';
+        isInHiddenTab() {
+            return data_get(this.parentTab, 'manipulations.action') === '@hide';
         },
 
         isPinnedAlias() {
diff --git a/resources/js/components/nav/Builder.vue b/resources/js/components/nav/Builder.vue
index f4b456fd166..6b4c541249e 100644
--- a/resources/js/components/nav/Builder.vue
+++ b/resources/js/components/nav/Builder.vue
@@ -22,7 +22,7 @@
                         </button>
                     </template>
                     <dropdown-item :text="__('Add Nav Item')" @click="addItem(topLevelTreeData)" />
-                    <dropdown-item :text="__('Add Section')" @click="addSection" />
+                    <dropdown-item :text="__('Add Tab')" @click="addTab" />
                 </dropdown-list>
 
                 <div class="ml-4 text-left" :class="{ 'btn-group': hasSaveAsOptions }">
@@ -64,12 +64,12 @@
             />
         </div>
 
-        <div v-if="!loading" class="page-tree page-tree-with-sections w-full">
+        <div v-if="!loading" class="page-tree page-tree-with-tabs w-full">
             <draggable-tree
                 draggable
                 cross-tree
                 class="mb-8"
-                :class="{ 'section-placeholder-inner': showTopLevelSectionPlaceholder }"
+                :class="{ 'tab-placeholder-inner': showTopLevelTabPlaceholder }"
                 ref="topLevelTree"
                 :data="topLevelTreeData"
                 :space="1"
@@ -85,7 +85,7 @@
                     :vm="vm"
                     :is-open="item.open"
                     :has-children="item.children.length > 0"
-                    :disable-sections="true"
+                    :disable-tabs="true"
                     :top-level="true"
                     @edit="editItem(item, true)"
                     @toggle-open="store.toggleOpen(item)"
@@ -118,7 +118,7 @@
             <draggable-tree
                 draggable
                 cross-tree
-                class="page-tree-with-sections"
+                class="page-tree-with-tabs"
                 ref="mainTree"
                 :data="mainTreeData"
                 :space="1"
@@ -130,7 +130,7 @@
                 <tree-branch
                     slot-scope="{ data: item, store, vm }"
                     :item="item"
-                    :parent-section="getParentSectionNode(item)"
+                    :parent-tab="getParentTabNode(item)"
                     :depth="vm.level"
                     :vm="vm"
                     :is-open="item.open"
@@ -147,11 +147,11 @@
                             :text="__('Edit')"
                             @click="editItem(item)" />
                         <dropdown-item
-                            v-if="! isSectionNode(item)"
+                            v-if="! isTabNode(item)"
                             :text="__('Pin to Top Level')"
                             @click="pinItem(item)" />
                         <dropdown-item
-                            v-if="! isSectionNode(item)"
+                            v-if="! isTabNode(item)"
                             :text="__('Duplicate')"
                             @click="aliasItem(item)" />
                         <li class="divider" />
@@ -183,18 +183,18 @@
             @updated="itemUpdated"
         />
 
-        <section-editor
-            v-if="creatingSection"
+        <tab-editor
+            v-if="creatingTab"
             :creating="true"
-            @closed="resetSectionEditor"
-            @updated="sectionAdded"
+            @closed="resetTabEditor"
+            @updated="tabAdded"
         />
 
-        <section-editor
-            v-if="editingSection"
-            :section-item="editingSection"
-            @closed="resetSectionEditor"
-            @updated="sectionUpdated"
+        <tab-editor
+            v-if="editingTab"
+            :tab-item="editingTab"
+            @closed="resetTabEditor"
+            @updated="tabUpdated"
         />
 
         <confirmation-modal
@@ -210,7 +210,7 @@
         <confirmation-modal
             v-if="confirmingRemoval"
             :title="__('Remove')"
-            :bodyText="__('Are you sure you want to remove this section and all of its children?')"
+            :bodyText="__('Are you sure you want to remove this tab and all of its children?')"
             :buttonText="__('Remove')"
             :danger="true"
             @confirm="removeItem(confirmingRemoval, true)"
@@ -225,7 +225,7 @@
 import {DraggableTree} from 'vue-draggable-nested-tree/dist/vue-draggable-nested-tree';
 import TreeBranch from './Branch.vue';
 import ItemEditor from './ItemEditor.vue';
-import SectionEditor from './SectionEditor.vue';
+import TabEditor from './TabEditor.vue';
 import { data_get } from  '../../bootstrap/globals.js'
 
 export default {
@@ -234,7 +234,7 @@ export default {
         DraggableTree,
         TreeBranch,
         ItemEditor,
-        SectionEditor,
+        TabEditor,
     },
 
     props: {
@@ -269,13 +269,13 @@ export default {
             loading: false,
             topLevelTreeData: [],
             mainTreeData: [],
-            originalSectionItems: {},
+            originalTabItems: {},
             changed: false,
             targetDataArray: null,
             creatingItem: false,
             editingItem: false,
-            creatingSection: false,
-            editingSection: false,
+            creatingTab: false,
+            editingTab: false,
             confirmingReset: false,
             confirmingRemoval: false,
             draggingNode: false,
@@ -304,7 +304,7 @@ export default {
             return this.saveAsOptions.length;
         },
 
-        showTopLevelSectionPlaceholder() {
+        showTopLevelTabPlaceholder() {
             if (! this.topLevelTreeData.length) {
                 return true;
             }
@@ -321,23 +321,23 @@ export default {
         setInitialNav(nav) {
             let navConfig = clone(nav);
 
-            this.setOriginalSectionItems(navConfig);
+            this.setOriginalTabItems(navConfig);
 
             let topLevelConfig = navConfig.shift();
 
             this.topLevelTreeData = _.chain(topLevelConfig.items)
-                .map(section => this.normalizeNavConfig(section, false))
+                .map(tab => this.normalizeNavConfig(tab, false))
                 .values()
                 .value();
 
             this.mainTreeData = _.chain(navConfig)
-                .mapObject(section => this.normalizeNavConfig(section))
+                .mapObject(tab => this.normalizeNavConfig(tab))
                 .values()
                 .value();
         },
 
-        setOriginalSectionItems(nav) {
-            nav.forEach(section => this.originalSectionItems[section.display_original] = section.items_original || []);
+        setOriginalTabItems(nav) {
+            nav.forEach(tab => this.originalTabItems[tab.display_original] = tab.items_original || []);
         },
 
         discardChanges() {
@@ -346,14 +346,14 @@ export default {
             this.changed = false;
         },
 
-        normalizeNavConfig(config, isSectionNode = true) {
+        normalizeNavConfig(config, isTabNode = true) {
             let item = {
                 text: config.display,
                 config: config,
                 original: config.original,
-                manipulations: isSectionNode ? config : config.manipulations || {},
-                isSection: isSectionNode,
-                open: isSectionNode,
+                manipulations: isTabNode ? config : config.manipulations || {},
+                isTab: isTabNode,
+                open: isTabNode,
             };
 
             let children = config.items || config.children;
@@ -367,7 +367,7 @@ export default {
                         config: childItem,
                         original: childItem.original,
                         manipulations: childItem.manipulations || {},
-                        isSection: false,
+                        isTab: false,
                     };
                 });
             }
@@ -386,26 +386,26 @@ export default {
             });
 
             // Ensure you can only drop nav item nodes into top level tree root
-            this.$set(this.$refs.topLevelTree.rootData, 'droppable', ! this.isSectionNode(node));
+            this.$set(this.$refs.topLevelTree.rootData, 'droppable', ! this.isTabNode(node));
 
-            // Ensure you can only drop section nodes to main tree root
-            this.$set(this.$refs.mainTree.rootData, 'droppable', this.isSectionNode(node));
+            // Ensure you can only drop tab nodes to main tree root
+            this.$set(this.$refs.mainTree.rootData, 'droppable', this.isTabNode(node));
 
             // Hardcode max depths
             const topLevelTreeMaxDepth = 2 - nodeDepth; // 2 for nav items, and one level of nav item children
-            const mainTreeMaxDepth = 3 - nodeDepth; // 3 for sections, nav items, and one level of nav item children
+            const mainTreeMaxDepth = 3 - nodeDepth; // 3 for tabs, nav items, and one level of nav item children
 
             // Ensure max depth for top level tree
             this.traverseTree(this.topLevelTreeData, (childNode, { depth }) => {
                 if (childNode !== node) {
-                    this.$set(childNode, 'droppable', depth <= topLevelTreeMaxDepth && ! this.isSectionNode(node));
+                    this.$set(childNode, 'droppable', depth <= topLevelTreeMaxDepth && ! this.isTabNode(node));
                 }
             });
 
             // Ensure max depth for main tree
             this.traverseTree(this.mainTreeData, (childNode, { depth }) => {
                 if (childNode !== node) {
-                    this.$set(childNode, 'droppable', depth <= mainTreeMaxDepth && ! this.isSectionNode(node));
+                    this.$set(childNode, 'droppable', depth <= mainTreeMaxDepth && ! this.isTabNode(node));
                 }
             });
         },
@@ -423,17 +423,17 @@ export default {
             });
         },
 
-        isSectionNode(node) {
-            return data_get(node, 'isSection', false);
+        isTabNode(node) {
+            return data_get(node, 'isTab', false);
         },
 
-        isCustomSectionNode(node) {
-            return this.isSectionNode(node) && data_get(node, 'manipulations.action') === '@create';
+        isCustomTabNode(node) {
+            return this.isTabNode(node) && data_get(node, 'manipulations.action') === '@create';
         },
 
-        getParentSectionNode(node) {
-            if (! this.isSectionNode(node) && node !== undefined) {
-                return this.getParentSectionNode(node.parent);
+        getParentTabNode(node) {
+            if (! this.isTabNode(node) && node !== undefined) {
+                return this.getParentTabNode(node.parent);
             }
 
             return node;
@@ -444,7 +444,7 @@ export default {
                 return false;
             }
 
-            return ! this.isSectionNode(node.parent);
+            return ! this.isTabNode(node.parent);
         },
 
         traverseTree(nodes, callback, parentPath = []) {
@@ -472,8 +472,8 @@ export default {
             this.creatingItem = true;
         },
 
-        addSection() {
-            this.creatingSection = true;
+        addTab() {
+            this.creatingTab = true;
         },
 
         itemAdded(createdConfig) {
@@ -490,21 +490,21 @@ export default {
             this.changed = true;
         },
 
-        sectionAdded(sectionDisplay) {
+        tabAdded(tabDisplay) {
             let item = this.normalizeNavConfig({
                 action: '@create',
-                display: sectionDisplay,
+                display: tabDisplay,
                 display_original: false,
             });
 
             this.mainTreeData.push(item);
-            this.resetSectionEditor();
+            this.resetTabEditor();
             this.changed = true;
         },
 
         editItem(item, topLevel) {
-            if (this.isSectionNode(item) && ! topLevel) {
-                this.editingSection = item;
+            if (this.isTabNode(item) && ! topLevel) {
+                this.editingTab = item;
             } else {
                 this.editingItem = item;
             }
@@ -521,10 +521,10 @@ export default {
             this.changed = true;
         },
 
-        sectionUpdated(sectionDisplay, sectionItem) {
-            sectionItem.text = sectionDisplay;
+        tabUpdated(tabDisplay, tabItem) {
+            tabItem.text = tabDisplay;
 
-            this.resetSectionEditor();
+            this.resetTabEditor();
             this.changed = true;
         },
 
@@ -539,7 +539,7 @@ export default {
         },
 
         updateItemAction(item) {
-            if (this.isSectionNode(item)) {
+            if (this.isTabNode(item)) {
                 return;
             }
 
@@ -580,8 +580,8 @@ export default {
                 return false;
             }
 
-            return this.itemHasMovedWithinSection(item)
-                || this.itemHasMovedToAnotherSection(item);
+            return this.itemHasMovedWithinTab(item)
+                || this.itemHasMovedToAnotherTab(item);
         },
 
         itemIsWithinOriginalParentItem(item) {
@@ -592,7 +592,7 @@ export default {
             return this.isChildItemNode(item) && parentsOriginalChildIds.includes(item.config.id);
         },
 
-        itemHasMovedWithinSection(item) {
+        itemHasMovedWithinTab(item) {
             let parentsOriginalChildIds = data_get(item.parent, 'original', { children: [] })
                 .children
                 .map(child => child.id);
@@ -601,25 +601,25 @@ export default {
                 return true;
             }
 
-            let currentSection = data_get(this.getParentSectionNode(item), 'config.display_original', 'Top Level');
-            let sectionsOriginalIds = this.originalSectionItems[currentSection];
+            let currentTab = data_get(this.getParentTabNode(item), 'config.display_original', 'Top Level');
+            let tabsOriginalIds = this.originalTabItems[currentTab];
 
-            if (sectionsOriginalIds === undefined) {
+            if (tabsOriginalIds === undefined) {
                 return false;
             }
 
-            if (! this.isChildItemNode(item) && ! sectionsOriginalIds.includes(item.config.id)) {
+            if (! this.isChildItemNode(item) && ! tabsOriginalIds.includes(item.config.id)) {
                 return true;
             }
 
             return false;
         },
 
-        itemHasMovedToAnotherSection(item) {
-            let currentSection = data_get(this.getParentSectionNode(item), 'config.display_original', 'Top Level');
-            let originalSection = data_get(item.original, 'section') || data_get(item.parent, 'original.section');
+        itemHasMovedToAnotherTab(item) {
+            let currentTab = data_get(this.getParentTabNode(item), 'config.display_original', 'Top Level');
+            let originalTab = data_get(item.original, 'tab') || data_get(item.parent, 'original.tab');
 
-            return currentSection !== originalSection;
+            return currentTab !== originalTab;
         },
 
         itemHasBeenModified(item) {
@@ -639,13 +639,13 @@ export default {
 
         expandAll() {
             this.traverseTree(this.topLevelTreeData, (node) => {
-                if (! this.isSectionNode(node)) {
+                if (! this.isTabNode(node)) {
                     this.$set(node, 'open', true);
                 }
             });
 
             this.traverseTree(this.mainTreeData, (node) => {
-                if (! this.isSectionNode(node)) {
+                if (! this.isTabNode(node)) {
                     this.$set(node, 'open', true);
                 }
             });
@@ -653,13 +653,13 @@ export default {
 
         collapseAll() {
             this.traverseTree(this.topLevelTreeData, (node) => {
-                if (! this.isSectionNode(node)) {
+                if (! this.isTabNode(node)) {
                     this.$set(node, 'open', false);
                 }
             });
 
             this.traverseTree(this.mainTreeData, (node) => {
-                if (! this.isSectionNode(node)) {
+                if (! this.isTabNode(node)) {
                     this.$set(node, 'open', false);
                 }
             });
@@ -671,9 +671,9 @@ export default {
             this.targetDataArray = false;
         },
 
-        resetSectionEditor() {
-            this.editingSection = false;
-            this.creatingSection = false;
+        resetTabEditor() {
+            this.editingTab = false;
+            this.creatingTab = false;
         },
 
         pinItem(item) {
@@ -710,7 +710,7 @@ export default {
         isHideable(item) {
             let action = data_get(item.manipulations, 'action');
 
-            if (this.isSectionNode(item) && action === '@create') {
+            if (this.isTabNode(item) && action === '@create') {
                 return false;
             }
 
@@ -718,7 +718,7 @@ export default {
         },
 
         removeItem(item, bypassConfirmation = false) {
-            if (this.isCustomSectionNode(item) && item.children.length && ! bypassConfirmation) {
+            if (this.isCustomTabNode(item) && item.children.length && ! bypassConfirmation) {
                 return this.confirmingRemoval = item;
             }
 
@@ -779,12 +779,12 @@ export default {
                 'items': this.prepareItemsForSubmission(this.topLevelTreeData),
             });
 
-            this.mainTreeData.forEach(section => {
+            this.mainTreeData.forEach(tab => {
                 tree.push({
-                    'display': section.text,
-                    'display_original': section.config.display_original || section.text,
-                    'action': section.manipulations.action || false,
-                    'items': this.prepareItemsForSubmission(section.children),
+                    'display': tab.text,
+                    'display_original': tab.config.display_original || tab.text,
+                    'action': tab.manipulations.action || false,
+                    'items': this.prepareItemsForSubmission(tab.children),
                 });
             });
 
diff --git a/resources/js/components/nav/SectionEditor.vue b/resources/js/components/nav/TabEditor.vue
similarity index 85%
rename from resources/js/components/nav/SectionEditor.vue
rename to resources/js/components/nav/TabEditor.vue
index a8ac5fcf421..c9054cb9cde 100644
--- a/resources/js/components/nav/SectionEditor.vue
+++ b/resources/js/components/nav/TabEditor.vue
@@ -4,7 +4,7 @@
         <div slot-scope="{ close }" class="bg-white h-full flex flex-col">
 
             <div class="bg-gray-200 px-6 py-2 border-b border-gray-300 text-lg font-medium flex items-center justify-between">
-                {{ creating ? __('Add Section') : __('Edit Section') }}
+                {{ creating ? __('Add Tab') : __('Edit Tab') }}
                 <button
                     type="button"
                     class="btn-close"
@@ -18,7 +18,7 @@
                 <div class="publish-field mb-8" :class="{ 'has-error': validate }">
                     <div class="field-inner">
                         <label class="text-sm font-medium mb-2">{{ __('Display') }} <span class="text-red">*</span></label>
-                        <text-input v-model="section" :focus="true" />
+                        <text-input v-model="tab" :focus="true" />
                         <div v-if="validate" class="help-block text-red mt-2"><p>{{ __('statamic::validation.required') }}</p></div>
                     </div>
                 </div>
@@ -44,12 +44,12 @@ export default {
 
     props: {
         creating: false,
-        sectionItem: {},
+        tabItem: {},
     },
 
     data() {
         return {
-            section: data_get(this.sectionItem, 'text') || '',
+            tab: data_get(this.tabItem, 'text') || '',
             saveKeyBinding: null,
             validate: false,
         }
@@ -71,12 +71,12 @@ export default {
         save() {
             this.validate = false;
 
-            if (! this.section) {
+            if (! this.tab) {
                 this.validate = true;
                 return;
             }
 
-            this.$emit('updated', this.section, this.sectionItem);
+            this.$emit('updated', this.tab, this.tabItem);
         },
 
     },
diff --git a/resources/js/components/navigation/EditForm.vue b/resources/js/components/navigation/EditForm.vue
index 52267f12798..c6d1761b3c3 100644
--- a/resources/js/components/navigation/EditForm.vue
+++ b/resources/js/components/navigation/EditForm.vue
@@ -12,7 +12,7 @@
         @updated="values = $event"
     >
         <div slot-scope="{ setFieldValue, setFieldMeta }">
-            <configure-sections
+            <configure-tabs
                 @updated="setFieldValue"
                 @meta-updated="setFieldMeta"
                 :enable-sidebar="false" />
diff --git a/resources/js/components/preferences/EditForm.vue b/resources/js/components/preferences/EditForm.vue
index 517f99f1b54..6024585c5f7 100644
--- a/resources/js/components/preferences/EditForm.vue
+++ b/resources/js/components/preferences/EditForm.vue
@@ -41,7 +41,7 @@
                 </div>
             </div>
 
-            <publish-sections
+            <publish-tabs
                 @updated="setFieldValue"
                 @meta-updated="setFieldMeta"
                 :can-toggle-labels="canToggleLabels"
@@ -75,7 +75,7 @@ export default {
             currentValues: this.values,
             error: null,
             errors: {},
-            hasSidebar: this.blueprint.sections.map(section => section.handle).includes('sidebar'),
+            hasSidebar: this.blueprint.tabs.map(tab => tab.handle).includes('sidebar'),
         }
     },
 
diff --git a/resources/js/components/publish/Field.vue b/resources/js/components/publish/Field.vue
index 14db1d335d6..2ba6fe33ad7 100644
--- a/resources/js/components/publish/Field.vue
+++ b/resources/js/components/publish/Field.vue
@@ -15,13 +15,13 @@
                 />
                 <i class="required ml-1" v-if="config.required">*</i>
                 <avatar v-if="isLocked" :user="lockingUser" class="w-4 rounded-full -mt-px ml-2 mr-2" v-tooltip="lockingUser.name" />
-                <span v-if="isReadOnly && !isSection" class="text-gray-500 font-normal text-2xs mx-1">
+                <span v-if="isReadOnly && !isTab" class="text-gray-500 font-normal text-2xs mx-1">
                     {{ isLocked ? __('Locked') : __('Read Only') }}
                 </span>
-                <svg-icon name="translate" class="h-4 ml-1 w-4 text-gray-600" v-if="isLocalizable && !isSection" v-tooltip.top="__('Localizable field')" />
+                <svg-icon name="translate" class="h-4 ml-1 w-4 text-gray-600" v-if="isLocalizable && !isTab" v-tooltip.top="__('Localizable field')" />
 
                 <button
-                    v-if="!isReadOnly && !isSection"
+                    v-if="!isReadOnly && !isTab"
                     v-show="syncable && isSynced"
                     class="outline-none"
                     :class="{ flex: syncable && isSynced }"
@@ -32,7 +32,7 @@
                 </button>
 
                 <button
-                    v-if="!isReadOnly && !isSection"
+                    v-if="!isReadOnly && !isTab"
                     v-show="syncable && !isSynced"
                     class="outline-none"
                     :class="{ flex: syncable && !isSynced }"
@@ -172,8 +172,8 @@ export default {
             return this.$config.get('sites').length > 1 && this.config.localizable;
         },
 
-        isSection() {
-            return this.config.type === 'section';
+        isTab() {
+            return this.config.type === 'tab';
         },
 
         classes() {
diff --git a/resources/js/components/publish/PublishForm.vue b/resources/js/components/publish/PublishForm.vue
index f54640c6b95..1ede3fa41ae 100644
--- a/resources/js/components/publish/PublishForm.vue
+++ b/resources/js/components/publish/PublishForm.vue
@@ -18,7 +18,7 @@
                 <button v-if="action" type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
             </div>
 
-            <publish-sections
+            <publish-tabs
                 @updated="setFieldValue"
                 @meta-updated="setFieldMeta"
                 :can-toggle-labels="canToggleLabels"
@@ -50,7 +50,7 @@ export default {
             currentValues: this.values,
             error: null,
             errors: {},
-            hasSidebar: this.blueprint.sections.map(section => section.handle).includes('sidebar'),
+            hasSidebar: this.blueprint.tabs.map(tab => tab.handle).includes('sidebar'),
         }
     },
 
diff --git a/resources/js/components/publish/Sections.vue b/resources/js/components/publish/Tabs.vue
similarity index 78%
rename from resources/js/components/publish/Sections.vue
rename to resources/js/components/publish/Tabs.vue
index 3e0c3dac02a..8050ca09bd6 100644
--- a/resources/js/components/publish/Sections.vue
+++ b/resources/js/components/publish/Tabs.vue
@@ -4,7 +4,7 @@
     <div>
 
         <!-- Tabs -->
-        <div 
+        <div
             v-if="showTabs"
             class="tabs-container flex items-center"
             :class="{ 'offset-for-sidebar': shouldShowSidebar }"
@@ -24,21 +24,21 @@
                 @mousewheel.prevent="scrollTabs"
                 @scroll="updateScrollHints"
             >
-                <button v-for="section in mainSections"
+                <button v-for="tab in mainTabs"
                     class="tab-button"
-                    :ref="section.handle + '-tab'"
-                    :key="section.handle"
+                    :ref="tab.handle + '-tab'"
+                    :key="tab.handle"
                     :class="{
-                        'active': isActive(section.handle),
-                        'has-error': sectionHasError(section.handle),
+                        'active': isActive(tab.handle),
+                        'has-error': tabHasError(tab.handle),
                     }"
                     role="tab"
-                    :id="tabId(section.handle)"
-                    :aria-controls="tabPanelId(section.handle)"
-                    :aria-selected="isActive(section.handle)"
-                    :tabindex="isActive(section.handle) ? 0 : -1"
-                    @click="setActive(section.handle)"
-                    v-text="section.display || `${section.handle[0].toUpperCase()}${section.handle.slice(1)}`"
+                    :id="tabId(tab.handle)"
+                    :aria-controls="tabPanelId(tab.handle)"
+                    :aria-selected="isActive(tab.handle)"
+                    :tabindex="isActive(tab.handle) ? 0 : -1"
+                    @click="setActive(tab.handle)"
+                    v-text="tab.display || `${tab.handle[0].toUpperCase()}${tab.handle.slice(1)}`"
                 />
             </div>
 
@@ -47,11 +47,11 @@
 
             <dropdown-list class="ml-2" v-cloak v-if="showHiddenTabsDropdown">
                 <dropdown-item
-                    v-for="(section, index) in mainSections"
+                    v-for="(tab, index) in mainTabs"
                     v-show="shouldShowInDropdown(index)"
-                    :key="section.handle"
-                    :text="section.display || `${section.handle[0].toUpperCase()}${section.handle.slice(1)}`"
-                    @click.prevent="setActive(section.handle)"
+                    :key="tab.handle"
+                    :text="tab.display || `${tab.handle[0].toUpperCase()}${tab.handle.slice(1)}`"
+                    @click.prevent="setActive(tab.handle)"
                 />
             </dropdown-list>
         </div>
@@ -60,20 +60,20 @@
         <div class="flex justify-between">
 
             <!-- Main -->
-            <div ref="publishSectionWrapper" class="publish-section-wrapper w-full min-w-0">
+            <div ref="publishTabWrapper" class="publish-tab-wrapper w-full min-w-0">
                 <div
-                    class="publish-section tab-panel w-full"
+                    class="publish-tab tab-panel w-full"
                     :class="showTabs && 'rounded-tl-none'"
                     :role="showTabs && 'tabpanel'"
-                    :id="showTabs && tabPanelId(section.handle)"
-                    :aria-labelledby="showTabs && tabId(section.handle)"
+                    :id="showTabs && tabPanelId(tab.handle)"
+                    :aria-labelledby="showTabs && tabId(tab.handle)"
                     tabindex="0"
-                    :key="section.handle"
-                    v-for="section in mainSections"
-                    v-show="isActive(section.handle)"
+                    :key="tab.handle"
+                    v-for="tab in mainTabs"
+                    v-show="isActive(tab.handle)"
                 >
                     <publish-fields
-                        :fields="section.fields"
+                        :fields="tab.fields"
                         :read-only="readOnly"
                         :syncable="syncable"
                         :can-toggle-labels="canToggleLabels"
@@ -89,16 +89,16 @@
 
             <!-- Sidebar(ish) -->
             <div :class="{ 'publish-sidebar': shouldShowSidebar }">
-                <div class="publish-section">
-                    <div class="publish-section-actions" :class="{ 'as-sidebar': shouldShowSidebar }">
+                <div class="publish-tab">
+                    <div class="publish-tab-actions" :class="{ 'as-sidebar': shouldShowSidebar }">
                         <portal :to="actionsPortal" :disabled="shouldShowSidebar">
                             <slot name="actions" :should-show-sidebar="shouldShowSidebar" />
                         </portal>
                     </div>
 
                     <publish-fields
-                        v-if="layoutReady && shouldShowSidebar && sidebarSection"
-                        :fields="sidebarSection.fields"
+                        v-if="layoutReady && shouldShowSidebar && sidebarTab"
+                        :fields="sidebarTab.fields"
                         :read-only="readOnly"
                         :syncable="syncable"
                         :can-toggle-labels="canToggleLabels"
@@ -113,7 +113,7 @@
             </div>
         </div>
 
-        <portal-target :name="actionsPortal" class="publish-section publish-section-actions-footer" />
+        <portal-target :name="actionsPortal" class="publish-tab publish-tab-actions-footer" />
 
     </div>
     </element-container>
@@ -139,7 +139,7 @@ export default {
         const state = this.$store.state.publish[this.storeName];
 
         return {
-            active: state.blueprint.sections[0].handle,
+            active: state.blueprint.tabs[0].handle,
             layoutReady: false,
             shouldShowSidebar: false,
             hiddenTabs: [],
@@ -155,26 +155,26 @@ export default {
             return this.$store.state.publish[this.storeName];
         },
 
-        sections() {
-            return this.state.blueprint.sections;
+        tabs() {
+            return this.state.blueprint.tabs;
         },
 
         inStack() {
             return this.actionsPortal !== 'publish-actions-base';
         },
 
-        mainSections() {
-            if (this.layoutReady && ! this.shouldShowSidebar) return this.sections;
+        mainTabs() {
+            if (this.layoutReady && ! this.shouldShowSidebar) return this.tabs;
 
-            return this.sections.filter(section => section.handle !== 'sidebar');
+            return this.tabs.filter(tab => tab.handle !== 'sidebar');
         },
 
-        sidebarSection() {
-            return this.sections.find(section => section.handle === 'sidebar');
+        sidebarTab() {
+            return this.tabs.find(tab => tab.handle === 'sidebar');
         },
 
         numberOfTabs() {
-            return this.mainSections.length;
+            return this.mainTabs.length;
         },
 
         showTabs() {
@@ -189,14 +189,14 @@ export default {
             return this.state.errors;
         },
 
-        sectionsWithErrors() {
+        tabsWithErrors() {
             const handles = Object.keys(this.errors).map((fieldHandle) => {
                 const topFieldHandle = fieldHandle.split('.')[0];
-                const section = this.sections.find(section =>
-                    section.fields.some(field => field.handle === topFieldHandle)
+                const tab = this.tabs.find(tab =>
+                    tab.fields.some(field => field.handle === topFieldHandle)
                 );
 
-                return section && section.handle
+                return tab && tab.handle
             });
 
             return _.uniq(handles);
@@ -226,8 +226,8 @@ export default {
 
     methods: {
 
-        sectionHasError(handle) {
-            return this.sectionsWithErrors.includes(handle);
+        tabHasError(handle) {
+            return this.tabsWithErrors.includes(handle);
         },
 
         setActive(handle) {
@@ -256,13 +256,13 @@ export default {
         },
 
         tabIndex(handle) {
-            return this.mainSections.findIndex(section => section.handle === (handle || this.active));
+            return this.mainTabs.findIndex(tab => tab.handle === (handle || this.active));
         },
 
         tabAt(index) {
-            const section = this.mainSections[index];
+            const tab = this.mainTabs[index];
 
-            return section ? section.handle : undefined;
+            return tab ? tab.handle : undefined;
         },
 
         setActiveTabFromHash() {
@@ -346,7 +346,7 @@ export default {
 
             if (side === 'left') {
                 this.$refs.tabs.scrollLeft = tab.offsetLeft - offset;
-            } 
+            }
             else {
                 this.$refs.tabs.scrollLeft = tab.offsetLeft + tab.offsetWidth - this.$refs.tabs.clientWidth + offset + 8;
             }
@@ -367,7 +367,7 @@ export default {
             this.shouldShowSidebar = (this.enableSidebar && width > 920);
 
             if (!this.layoutReady) return;
-                
+
             this.$nextTick(() => {
                 this.updateScrollHints();
                 this.updateHiddenTabs();
@@ -396,8 +396,8 @@ export default {
 
             if ((viewportRect.left - tabRect.left) > tolerance) {
                 return 'left';
-            } 
-            
+            }
+
             if ((tabRect.right - viewportRect.right) > tolerance) {
                 return 'right';
             }
diff --git a/resources/js/components/roles/PublishForm.vue b/resources/js/components/roles/PublishForm.vue
index d13bee557a2..c2c5c6e5d7d 100644
--- a/resources/js/components/roles/PublishForm.vue
+++ b/resources/js/components/roles/PublishForm.vue
@@ -9,7 +9,7 @@
                 </div>
             </header>
 
-            <div class="card p-0 mb-6 configure-section publish-fields @container">
+            <div class="card p-0 mb-6 configure-tab publish-fields @container">
 
                 <form-group
                     handle="title"
diff --git a/resources/js/components/structures/PageEditor.vue b/resources/js/components/structures/PageEditor.vue
index 1443ed920e7..894cf4b457f 100644
--- a/resources/js/components/structures/PageEditor.vue
+++ b/resources/js/components/structures/PageEditor.vue
@@ -112,9 +112,9 @@ export default {
                 return ! isMissingField(fields, handle);
             }
 
-            // This UI only supports the first section
+            // This UI only supports the first tab
             const blueprint = clone(this.blueprint);
-            const fields = blueprint.sections[0].fields;
+            const fields = blueprint.tabs[0].fields;
 
             if (this.type == 'url' && isMissingField(fields, 'url')) {
                 fields.unshift({
@@ -139,12 +139,12 @@ export default {
                 });
             }
 
-            return { ...blueprint, sections: [{ fields }] };
+            return { ...blueprint, tabs: [{ fields }] };
         },
 
         fields() {
-            return _.chain(this.adjustedBlueprint.sections)
-                .map(section => section.fields)
+            return _.chain(this.adjustedBlueprint.tabs)
+                .map(tab => tab.fields)
                 .flatten(true)
                 .value();
         }
diff --git a/resources/js/components/taxonomies/EditForm.vue b/resources/js/components/taxonomies/EditForm.vue
index 15f27e9f120..2081e0fee90 100644
--- a/resources/js/components/taxonomies/EditForm.vue
+++ b/resources/js/components/taxonomies/EditForm.vue
@@ -19,7 +19,7 @@
                     <button type="submit" class="btn-primary" @click="submit">{{ __('Save') }}</button>
                 </div>
             </header>
-            <configure-sections
+            <configure-tabs
                 @updated="setFieldValue"
                 @meta-updated="setFieldMeta"
                 :enable-sidebar="false"/>
diff --git a/resources/js/components/terms/PublishForm.vue b/resources/js/components/terms/PublishForm.vue
index 944a95dbca6..e4faa395897 100644
--- a/resources/js/components/terms/PublishForm.vue
+++ b/resources/js/components/terms/PublishForm.vue
@@ -84,9 +84,9 @@
                         v-bind="component.props"
                     />
 
-                    <transition name="live-preview-sections-drop">
-                        <publish-sections
-                            v-show="sectionsVisible"
+                    <transition name="live-preview-tabs-drop">
+                        <publish-tabs
+                            v-show="tabsVisible"
                             :read-only="readOnly"
                             :syncable="hasOrigin"
                             :can-toggle-labels="true"
@@ -184,7 +184,7 @@
                                 </div>
 
                             </template>
-                        </publish-sections>
+                        </publish-tabs>
                     </transition>
                 </div>
             </live-preview>
@@ -306,7 +306,7 @@ export default {
             error: null,
             errors: {},
             isPreviewing: false,
-            sectionsVisible: true,
+            tabsVisible: true,
             state: 'new',
             revisionMessage: null,
             showRevisionHistory: false,
@@ -559,18 +559,18 @@ export default {
         },
 
         openLivePreview() {
-            this.sectionsVisible = false;
+            this.tabsVisible = false;
             this.$wait(200)
                 .then(() => {
                     this.isPreviewing = true;
                     return this.$wait(300);
                 })
-                .then(() => this.sectionsVisible = true);
+                .then(() => this.tabsVisible = true);
         },
 
         closeLivePreview() {
             this.isPreviewing = false;
-            this.sectionsVisible = true;
+            this.tabsVisible = true;
         },
 
         publishActionCompleted({ published, isWorkingCopy, response }) {
diff --git a/resources/js/components/users/PublishForm.vue b/resources/js/components/users/PublishForm.vue
index 802ef9905ae..6dcfc57ebf8 100644
--- a/resources/js/components/users/PublishForm.vue
+++ b/resources/js/components/users/PublishForm.vue
@@ -37,14 +37,14 @@
             @updated="values = $event"
         >
             <div slot-scope="{ container, setFieldValue, setFieldMeta }">
-                <publish-sections
+                <publish-tabs
                     :enable-sidebar="false"
                     :can-toggle-labels="true"
                     @updated="setFieldValue"
                     @meta-updated="setFieldMeta"
                     @focus="container.$emit('focus', $event)"
                     @blur="container.$emit('blur', $event)"
-                ></publish-sections>
+                ></publish-tabs>
             </div>
         </publish-container>
 
diff --git a/resources/lang/cs/messages.php b/resources/lang/cs/messages.php
index 06fa9a8914b..6d2c4555eb4 100644
--- a/resources/lang/cs/messages.php
+++ b/resources/lang/cs/messages.php
@@ -165,7 +165,7 @@
     'session_expiry_logging_out_in_seconds' => 'Budete odhlášeni za :seconds sekund.',
     'session_expiry_new_window' => 'Otevřete nové okno',
     'show_slugs_instructions' => 'Zobrazit slugs v přehledu stránek.',
-    'tab_sections_instructions' => 'Pole v jednotlivých oddílech jsou seskupena do karet. Můžete vytvářet nová pole, znovu používat stávající pole nebo importovat celé skupiny polí z existujících sad polí.',
+    'tabs_instructions' => 'Pole v jednotlivých oddílech jsou seskupena do karet. Můžete vytvářet nová pole, znovu používat stávající pole nebo importovat celé skupiny polí z existujících sad polí.',
     'taxonomies_blueprints_instructions' => 'Termíny v této taxonomii mohou používat kterýkoli z těchto vzorů.',
     'taxonomies_collections_instructions' => 'Sbírky, ve kterých se tato taxonomie používá.',
     'taxonomies_preview_targets_instructions' => 'Adresy URL, které lze zobrazit v živém náhledu. Více informací najdete v [Dokumentaci](https://statamic.dev/live-preview#preview-targets).',
diff --git a/resources/lang/da/messages.php b/resources/lang/da/messages.php
index e28b3303631..fbd0114e038 100644
--- a/resources/lang/da/messages.php
+++ b/resources/lang/da/messages.php
@@ -150,7 +150,7 @@
     'session_expiry_logged_out_for_inactivity' => 'Du er logget ud, fordi du har været inaktiv i et stykke tid.',
     'session_expiry_logging_out_in_seconds' => 'Du har været inaktiv i et stykke tid og bliver logget ud på :seconds sekunder. Klik for at udvide din session.',
     'session_expiry_new_window' => 'Åbner i nyt vindue. Kom tilbage, når du er logget ind.',
-    'tab_sections_instructions' => 'Felterne i hvert afsnit grupperes i faner. Opret nye felter, genbrug eksisterende felter, eller importer hele grupper af felter fra eksisterende feltsæt.',
+    'tabs_instructions' => 'Felterne i hvert afsnit grupperes i faner. Opret nye felter, genbrug eksisterende felter, eller importer hele grupper af felter fra eksisterende feltsæt.',
     'taxonomies_blueprints_instructions' => 'Vilkår i denne taksonomi kan bruge en hvilken som helst af disse blueprints.',
     'taxonomies_collections_instructions' => 'De samlinger, der bruger denne taksonomi.',
     'taxonomy_configure_handle_instructions' => 'Bruges til at henvise til denne taksonomi på frontend. Det er besværligt at ændre senere.',
diff --git a/resources/lang/de/messages.php b/resources/lang/de/messages.php
index 8948cc35bfe..e40d89a032b 100644
--- a/resources/lang/de/messages.php
+++ b/resources/lang/de/messages.php
@@ -185,7 +185,7 @@
     'session_expiry_logging_out_in_seconds' => 'Du bist seit einiger Zeit inaktiv und wirst in :seconds Sekunden abgemeldet. Klicke, um deine Sitzung zu verlängern.',
     'session_expiry_new_window' => 'Wird in einem neuen Fenster geöffnet. Komm zurück, sobald du dich angemeldet hast.',
     'show_slugs_instructions' => 'Soll der Slug in der Listenansicht angezeigt werden?',
-    'tab_sections_instructions' => 'Die Felder in jedem Abschnitt werden in Tabs gruppiert. Du kannst neue Felder erstellen, vorhandene Felder wieder verwenden oder ganze Feldgruppen aus vorhandenen Fieldsets importieren.',
+    'tabs_instructions' => 'Die Felder in jedem Abschnitt werden in Tabs gruppiert. Du kannst neue Felder erstellen, vorhandene Felder wieder verwenden oder ganze Feldgruppen aus vorhandenen Fieldsets importieren.',
     'taxonomies_blueprints_instructions' => 'Begriffe in dieser Taxonomie können jedes dieser Blueprints verwenden.',
     'taxonomies_collections_instructions' => 'Die Sammlungen, in denen diese Taxonomie verwendet wird.',
     'taxonomies_preview_targets_instructions' => 'Die URLs, die in der Live-Vorschau angezeigt werden können. Erfahre mehr in der [Dokumentation](https://statamic.dev/live-preview#preview-targets).',
diff --git a/resources/lang/de_CH/messages.php b/resources/lang/de_CH/messages.php
index 744dcdc5cd1..55612071c67 100644
--- a/resources/lang/de_CH/messages.php
+++ b/resources/lang/de_CH/messages.php
@@ -185,7 +185,7 @@
     'session_expiry_logging_out_in_seconds' => 'Du bist seit einiger Zeit inaktiv und wirst in :seconds Sekunden abgemeldet. Klicke, um deine Sitzung zu verlängern.',
     'session_expiry_new_window' => 'Wird in einem neuen Fenster geöffnet. Komm zurück, sobald du dich angemeldet hast.',
     'show_slugs_instructions' => 'Soll der Slug in der Listenansicht angezeigt werden?',
-    'tab_sections_instructions' => 'Die Felder in jedem Abschnitt werden in Tabs gruppiert. Du kannst neue Felder erstellen, vorhandene Felder wieder verwenden oder ganze Feldgruppen aus vorhandenen Fieldsets importieren.',
+    'tabs_instructions' => 'Die Felder in jedem Abschnitt werden in Tabs gruppiert. Du kannst neue Felder erstellen, vorhandene Felder wieder verwenden oder ganze Feldgruppen aus vorhandenen Fieldsets importieren.',
     'taxonomies_blueprints_instructions' => 'Begriffe in dieser Taxonomie können jedes dieser Blueprints verwenden.',
     'taxonomies_collections_instructions' => 'Die Sammlungen, in denen diese Taxonomie verwendet wird.',
     'taxonomies_preview_targets_instructions' => 'Die URLs, die in der Live-Vorschau angezeigt werden können. Erfahre mehr in der [Dokumentation](https://statamic.dev/live-preview#preview-targets).',
diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
index 62a62bbc62d..ab36cf918f0 100644
--- a/resources/lang/en/messages.php
+++ b/resources/lang/en/messages.php
@@ -186,7 +186,7 @@
     'session_expiry_logging_out_in_seconds' => 'You have been inactive for a while and will be logged out in :seconds seconds. Click to extend your session.',
     'session_expiry_new_window' => 'Opens in a new window. Come back once you\'ve logged in.',
     'show_slugs_instructions' => 'Whether to display slugs in the tree view.',
-    'tab_sections_instructions' => 'The fields in each section will be grouped together into tabs. Create new fields, reuse existing fields, or import entire groups of fields from existing fieldsets.',
+    'tabs_instructions' => 'The fields in each section will be grouped together into tabs. Create new fields, reuse existing fields, or import entire groups of fields from existing fieldsets.',
     'taxonomies_blueprints_instructions' => 'Terms in this taxonomy may use any of these blueprints.',
     'taxonomies_collections_instructions' => 'The collections that use this taxonomy.',
     'taxonomies_preview_targets_instructions' => 'The URLs to be viewable within Live Preview. Learn more in the [documentation](https://statamic.dev/live-preview#preview-targets).',
diff --git a/resources/lang/es/messages.php b/resources/lang/es/messages.php
index 132c56a4d07..bef741a8b6c 100644
--- a/resources/lang/es/messages.php
+++ b/resources/lang/es/messages.php
@@ -168,7 +168,7 @@
     'session_expiry_logging_out_in_seconds' => '¡Tu sesión ha estado inactiva durante un rato y se cerrará en :seconds segundos! Haz clic para extender tu sesión y seguir trabajando.',
     'session_expiry_new_window' => 'Se abrirá una ventana nueva. Vuelve aquí una vez que hayas iniciado sesión.',
     'show_slugs_instructions' => 'Ya sea para mostrar slugs en la vista de árbol.',
-    'tab_sections_instructions' => 'Los campos en cada sección se agruparán en pestañas. Crea nuevos campos, reutiliza campos existentes o importa grupos enteros de campos en conjuntos de campos existentes.',
+    'tabs_instructions' => 'Los campos en cada sección se agruparán en pestañas. Crea nuevos campos, reutiliza campos existentes o importa grupos enteros de campos en conjuntos de campos existentes.',
     'taxonomies_blueprints_instructions' => 'Los términos en esta taxonomía pueden ser usados en cualquiera de estos planos.',
     'taxonomies_collections_instructions' => 'Las colecciones que usan esta taxonomía.',
     'taxonomies_preview_targets_instructions' => 'Las direcciones URL que se pueden ver en Vista previa en vivo. Obtén más información en la [documentación](https://statamic.dev/live-preview#preview-targets).',
diff --git a/resources/lang/fr/messages.php b/resources/lang/fr/messages.php
index 04038874de4..c801e39335c 100644
--- a/resources/lang/fr/messages.php
+++ b/resources/lang/fr/messages.php
@@ -186,7 +186,7 @@
     'session_expiry_logging_out_in_seconds' => 'Vous avez été inactif pendant un certain temps et vous serez déconnecté dans :seconds secondes. Cliquez pour prolonger votre session.',
     'session_expiry_new_window' => 'S’ouvre dans une nouvelle fenêtre. Revenez une fois que serez reconnecté.',
     'show_slugs_instructions' => 'Afficher les identifiants dans la vue arborescente ?',
-    'tab_sections_instructions' => 'Les champs de chaque section seront regroupés dans des onglets. Créez de nouveaux champs, réutilisez des champs existants ou importez des groupes entiers de champs à partir de jeux de champs existants.',
+    'tabs_instructions' => 'Les champs de chaque section seront regroupés dans des onglets. Créez de nouveaux champs, réutilisez des champs existants ou importez des groupes entiers de champs à partir de jeux de champs existants.',
     'taxonomies_blueprints_instructions' => 'Les termes de cette taxonomie peuvent utiliser n’importe lequel de ces Blueprints.',
     'taxonomies_collections_instructions' => 'Les collections qui utilisent cette taxonomie.',
     'taxonomies_preview_targets_instructions' => 'Les URLs qui seront visibles dans l’Aperçu en direct. Apprenez-en plus dans la [documentation](https://statamic.dev/live-preview#preview-targets).',
diff --git a/resources/lang/hu/messages.php b/resources/lang/hu/messages.php
index 93addc83e2f..1cadc1061f1 100644
--- a/resources/lang/hu/messages.php
+++ b/resources/lang/hu/messages.php
@@ -171,7 +171,7 @@
     'session_expiry_logging_out_in_seconds' => 'Egy ideje inaktív, ezért :seconds másodperc múlva automatikusan kijelentkeztetjük. Ennek elkerüléséhez kattintson ide!',
     'session_expiry_new_window' => 'Új ablakban nyílik meg. Jöjjön vissza, miután bejelentkezett.',
     'show_slugs_instructions' => 'Megjelenjenek-e a "slug"-ok a fa nézetben.',
-    'tab_sections_instructions' => 'Az egyes szekciók mezői fülekbe (tabs) lesznek csoportosítva.',
+    'tabs_instructions' => 'Az egyes szekciók mezői fülekbe (tabs) lesznek csoportosítva.',
     'taxonomies_blueprints_instructions' => 'A taxonómia kifejezései ezen Blueprintek bármelyikét felhasználhatják.',
     'taxonomies_collections_instructions' => 'Azok a gyűjtemények, amelyek ezt a taxonómiát használják.',
     'taxonomies_preview_targets_instructions' => 'Az élő előnézetben megtekinthető URL-ek. További információ a [dokumentációban](https://statamic.dev/live-preview#preview-targets).',
diff --git a/resources/lang/id/messages.php b/resources/lang/id/messages.php
index 9236ee8feb8..28946a1ba10 100644
--- a/resources/lang/id/messages.php
+++ b/resources/lang/id/messages.php
@@ -149,7 +149,7 @@
     'session_expiry_logged_out_for_inactivity' => 'Anda telah keluar karena Anda tidak aktif untuk sementara waktu.',
     'session_expiry_logging_out_in_seconds' => 'Anda sudah tidak aktif untuk sementara waktu dan akan keluar dalam :seconds detik. Klik untuk memperpanjang sesi Anda.',
     'session_expiry_new_window' => 'Buka di jendela baru. Kembalilah setelah Anda masuk.',
-    'tab_sections_instructions' => 'Bidang di setiap bagian akan dikelompokkan menjadi beberapa tab. Buat bidang baru, gunakan kembali bidang yang ada, atau impor seluruh grup bidang dari fieldsets yang ada.',
+    'tabs_instructions' => 'Bidang di setiap bagian akan dikelompokkan menjadi beberapa tab. Buat bidang baru, gunakan kembali bidang yang ada, atau impor seluruh grup bidang dari fieldsets yang ada.',
     'taxonomies_blueprints_instructions' => 'Istilah dalam taksonomi ini dapat menggunakan salah satu dari cetak biru ini.',
     'taxonomies_collections_instructions' => 'Koleksi yang menggunakan taksonomi ini.',
     'taxonomy_configure_handle_instructions' => 'Digunakan untuk mereferensikan taksonomi ini di frontend. Tidak sepele untuk berubah nanti.',
diff --git a/resources/lang/it/messages.php b/resources/lang/it/messages.php
index 6a4b21cc175..f29559b9e2d 100644
--- a/resources/lang/it/messages.php
+++ b/resources/lang/it/messages.php
@@ -149,7 +149,7 @@
     'session_expiry_logged_out_for_inactivity' => 'Sei stato disconnesso perché risulti inattivo da un po\'.',
     'session_expiry_logging_out_in_seconds' => 'Risulti inattivo da un po\'e verrai disconnesso tra :seconds secondi. Clicca per estendere la sessione.',
     'session_expiry_new_window' => 'Apertura in una nuova finestra. Torna dopo aver effettuato l\'accesso.',
-    'tab_sections_instructions' => 'I campi in ciascuna sezione saranno raggruppati in schede. Crea nuovi campi, riutilizza campi esistenti o importa interi gruppi di campi da fieldset esistenti.',
+    'tabs_instructions' => 'I campi in ciascuna sezione saranno raggruppati in schede. Crea nuovi campi, riutilizza campi esistenti o importa interi gruppi di campi da fieldset esistenti.',
     'taxonomies_blueprints_instructions' => 'I termini di questa tassonomia possono utilizzare uno qualsiasi di questi progetti.',
     'taxonomies_collections_instructions' => 'Le raccolte che utilizzano questa tassonomia.',
     'taxonomy_configure_handle_instructions' => 'Utilizzato come riferimento a questa tassonomia sul frontend. Non è semplice modificarlo successivamente.',
diff --git a/resources/lang/ms/messages.php b/resources/lang/ms/messages.php
index c9d491ebb8d..7c0edc26447 100644
--- a/resources/lang/ms/messages.php
+++ b/resources/lang/ms/messages.php
@@ -165,7 +165,7 @@
     'session_expiry_logging_out_in_seconds' => 'Anda telah tidak aktif untuk seketika dan akan dilog keluar masuk :seconds seconds. Klik untuk melanjutkan sesi anda.',
     'session_expiry_new_window' => 'Dibuka dalam tetingkap baharu. Kembali setelah anda log masuk.',
     'show_slugs_instructions' => 'Sama ada untuk memaparkan slug dalam paparan pokok.',
-    'tab_sections_instructions' => 'Medan dalam setiap bahagian akan dikumpulkan bersama ke dalam tab. Cipta bidang baharu, gunakan semula bidang sedia ada atau import keseluruhan kumpulan bidang daripada set bidang sedia ada.',
+    'tabs_instructions' => 'Medan dalam setiap bahagian akan dikumpulkan bersama ke dalam tab. Cipta bidang baharu, gunakan semula bidang sedia ada atau import keseluruhan kumpulan bidang daripada set bidang sedia ada.',
     'taxonomies_blueprints_instructions' => 'Terma dalam taksonomi ini boleh menggunakan mana-mana cetakan biru ini.',
     'taxonomies_collections_instructions' => 'Koleksi yang menggunakan taksonomi ini.',
     'taxonomy_configure_handle_instructions' => 'Digunakan untuk merujuk taksonomi ini pada bahagian hadapan. Bukan remeh untuk berubah nanti.',
diff --git a/resources/lang/nb/messages.php b/resources/lang/nb/messages.php
index 5bd9d5ba163..003bc7479b8 100644
--- a/resources/lang/nb/messages.php
+++ b/resources/lang/nb/messages.php
@@ -186,7 +186,7 @@
     'session_expiry_logging_out_in_seconds' => 'Du har vært inaktiv en stund og vil bli logget ut om :seconds sekunder. Klikk for å forlenge økten.',
     'session_expiry_new_window' => 'Åpner et nytt vindu. Kom tilbake når du har logget deg inn.',
     'show_slugs_instructions' => 'Om permalenker skal vises i trevisningen eller ikke.',
-    'tab_sections_instructions' => 'Feltene i hver inndeling grupperes i faner. Opprett nye felter, bruk eksisterende felter om igjen eller importer hele grupper med felter fra eksisterende feltsett.',
+    'tabs_instructions' => 'Feltene i hver inndeling grupperes i faner. Opprett nye felter, bruk eksisterende felter om igjen eller importer hele grupper med felter fra eksisterende feltsett.',
     'taxonomies_blueprints_instructions' => 'Betingelser i denne taksonomien kan bruke en hvilken som helst av disse blueprintene.',
     'taxonomies_collections_instructions' => 'Samlingene som bruker denne taksonomien.',
     'taxonomies_preview_targets_instructions' => 'URL-ene som skal kunne vises i forhåndsvisning. Les mer i [dokumentasjon](https://statamic.dev/live-preview#preview-targets).',
diff --git a/resources/lang/nl/messages.php b/resources/lang/nl/messages.php
index 093d633f78a..dc9fec1adac 100644
--- a/resources/lang/nl/messages.php
+++ b/resources/lang/nl/messages.php
@@ -186,7 +186,7 @@
     'session_expiry_logging_out_in_seconds' => 'Je bent een tijd inactief geweest en wordt uitgelogd over :seconds seconden. Klik hier om je sessie te verlengen.',
     'session_expiry_new_window' => 'Opent in een nieuw venster. Kom terug als je ingelogd bent.',
     'show_slugs_instructions' => 'Toon slugs in de boomweergave.',
-    'tab_sections_instructions' => 'De velden in iedere sectie worden gegroepeerd in tabs. Voeg nieuwe velden toe, herbruik bestaande velden of importeer groepen van velden uit reeds bestaande fieldsets.',
+    'tabs_instructions' => 'De velden in iedere sectie worden gegroepeerd in tabs. Voeg nieuwe velden toe, herbruik bestaande velden of importeer groepen van velden uit reeds bestaande fieldsets.',
     'taxonomies_blueprints_instructions' => 'Termen in deze taxonomie mogen in al deze blueprints gebruikt worden.',
     'taxonomies_collections_instructions' => 'De collectie die deze taxonomie gebruikt.',
     'taxonomies_preview_targets_instructions' => 'De URLs die je kunt bezoeken via Live Preview. Lees meer in de [documentatie](https://statamic.dev/live-preview#preview-targets).',
diff --git a/resources/lang/pl/messages.php b/resources/lang/pl/messages.php
index c596ff147cf..7d1f9f79b12 100644
--- a/resources/lang/pl/messages.php
+++ b/resources/lang/pl/messages.php
@@ -160,7 +160,7 @@
     'session_expiry_logging_out_in_seconds' => 'Byłeś nieaktywny przez jakiś czas i zostaniesz wylogowany za :seconds sekund. Kliknij, aby przedłużyć sesję.',
     'session_expiry_new_window' => 'Otwiera się w nowym oknie. Wróć po zalogowaniu.',
     'show_slugs_instructions' => 'Czy wyświetlać slugi w widoku drzewa.',
-    'tab_sections_instructions' => 'Pola w każdej sekcji zostaną pogrupowane w zakładki. Twórz nowe pola, wykorzystuj istniejące lub importuj stworzone grupy pól.',
+    'tabs_instructions' => 'Pola w każdej sekcji zostaną pogrupowane w zakładki. Twórz nowe pola, wykorzystuj istniejące lub importuj stworzone grupy pól.',
     'taxonomies_blueprints_instructions' => 'Terminy w tej taksonomii mogą wykorzystywać dowolny z tych schematów.',
     'taxonomies_collections_instructions' => 'Kolekcje korzystające z tej taksonomii.',
     'taxonomy_configure_handle_instructions' => 'Służy do odwoływania się do tej taksonomii na frontendzie. Późniejsza zmiana może być problematyczna.',
diff --git a/resources/lang/pt/messages.php b/resources/lang/pt/messages.php
index 9cff3471135..8a828ce51b8 100644
--- a/resources/lang/pt/messages.php
+++ b/resources/lang/pt/messages.php
@@ -149,7 +149,7 @@
     'session_expiry_logged_out_for_inactivity' => 'Terminamos a sua sessão porque está inactivo há algum tempo.',
     'session_expiry_logging_out_in_seconds' => 'Está inactivo há algum tempo e será desconectado em :seconds segundos. Clique para prolongar a sua sessão.',
     'session_expiry_new_window' => 'Abre em uma nova janela. Volte depois de iniciar a sessão.',
-    'tab_sections_instructions' => 'Os campos em cada secção serão agrupados em guias. Crie novos campos, reutilize campos existentes ou importe grupos inteiros de campos de conjuntos de campos existentes.',
+    'tabs_instructions' => 'Os campos em cada secção serão agrupados em guias. Crie novos campos, reutilize campos existentes ou importe grupos inteiros de campos de conjuntos de campos existentes.',
     'taxonomies_blueprints_instructions' => 'Os termos nesta taxonomia podem usar qualquer um desses diagramas.',
     'taxonomies_collections_instructions' => 'As coleções que usam essa taxonomia.',
     'taxonomy_configure_handle_instructions' => 'Usado para referenciar essa taxonomia no frontend. Não é trivial mudar mais tarde.',
diff --git a/resources/lang/pt_BR/messages.php b/resources/lang/pt_BR/messages.php
index 80b02112707..871abdaac5b 100644
--- a/resources/lang/pt_BR/messages.php
+++ b/resources/lang/pt_BR/messages.php
@@ -168,7 +168,7 @@
     'session_expiry_logging_out_in_seconds' => 'Você ficou inativo por um tempo e será desconectado em :seconds segundos. Clique para estender sua sessão.',
     'session_expiry_new_window' => 'Abre em uma nova janela. Volte assim que estiver logado.',
     'show_slugs_instructions' => 'Se os slugs devem ser exibidos na exibição em árvore.',
-    'tab_sections_instructions' => 'Os campos em cada seção serão agrupados em guias. Crie novos campos, reutilize campos existentes ou importe grupos inteiros de campos de conjuntos de campos existentes.',
+    'tabs_instructions' => 'Os campos em cada seção serão agrupados em guias. Crie novos campos, reutilize campos existentes ou importe grupos inteiros de campos de conjuntos de campos existentes.',
     'taxonomies_blueprints_instructions' => 'Os termos desta taxonomia podem usar qualquer um desses diagramas.',
     'taxonomies_collections_instructions' => 'As coleções que usam essa taxonomia.',
     'taxonomies_preview_targets_instructions' => 'Os URLs a serem visualizados na Visualização ao Vivo. Saiba mais na [documentação](https://statamic.dev/live-preview#preview-targets).',
diff --git a/resources/lang/ru/messages.php b/resources/lang/ru/messages.php
index ef668d84e78..5de19dd349b 100644
--- a/resources/lang/ru/messages.php
+++ b/resources/lang/ru/messages.php
@@ -165,7 +165,7 @@
     'session_expiry_logging_out_in_seconds' => 'Вы были неактивны некоторое время и будете выведены из системы через :seconds. Нажмите, чтобы продлить сеанс.',
     'session_expiry_new_window' => 'Открывается в новом окне. Вернитесь, когда войдете в систему.',
     'show_slugs_instructions' => 'Отображать ли слаги в древовидном представлении.',
-    'tab_sections_instructions' => 'Поля в каждой секции группируются по вкладкам. Создавайте новые поля, повторно используйте существующие или импортируйте целые группы полей из готовых наборов.',
+    'tabs_instructions' => 'Поля в каждой секции группируются по вкладкам. Создавайте новые поля, повторно используйте существующие или импортируйте целые группы полей из готовых наборов.',
     'taxonomies_blueprints_instructions' => 'Термины в этой таксономии могут использовать любой из этих чертежей.',
     'taxonomies_collections_instructions' => 'Коллекции, использующие эту таксономию.',
     'taxonomy_configure_handle_instructions' => 'Используется для ссылки на эту таксономию во фронтенде. Это непросто изменить позже',
diff --git a/resources/lang/sl/messages.php b/resources/lang/sl/messages.php
index 744076fdf20..67a2df754cd 100644
--- a/resources/lang/sl/messages.php
+++ b/resources/lang/sl/messages.php
@@ -149,7 +149,7 @@
     'session_expiry_logged_out_for_inactivity' => 'Odjavljeni ste bili, ker ste bili nekaj časa neaktivni.',
     'session_expiry_logging_out_in_seconds' => 'Nekaj časa ste bili neaktivni in se boste odjavili v :seconds sekundah. Kliknite, če želite podaljšati sejo.',
     'session_expiry_new_window' => 'Odpre se v novem oknu. Vrnite se, ko se prijavite.',
-    'tab_sections_instructions' => 'Polja v vsakem odseku bodo združena v zavihke. Ustvarite nova polja, znova uporabite obstoječa polja ali uvozite celotne skupine polj iz obstoječih naborov polj.',
+    'tabs_instructions' => 'Polja v vsakem odseku bodo združena v zavihke. Ustvarite nova polja, znova uporabite obstoječa polja ali uvozite celotne skupine polj iz obstoječih naborov polj.',
     'taxonomies_blueprints_instructions' => 'Izrazi v tej taksonomiji lahko uporabljajo katerega koli od teh načrtov.',
     'taxonomies_collections_instructions' => 'Zbirke, ki uporabljajo to taksonomijo.',
     'taxonomy_configure_handle_instructions' => 'Uporablja se za sklicevanje na to taksonomijo na sprednji strani. Pozneje se spreminjati ni trivialno.',
diff --git a/resources/lang/sv/messages.php b/resources/lang/sv/messages.php
index 44e7e410045..7cec7980208 100644
--- a/resources/lang/sv/messages.php
+++ b/resources/lang/sv/messages.php
@@ -157,7 +157,7 @@
     'session_expiry_logging_out_in_seconds' => 'Du har varit inaktiv ett tag och kommer att loggas ut om :seconds sekunder. Klicka för att förlänga din session.',
     'session_expiry_new_window' => 'Öppnas i ett nytt fönster. Kom tillbaka när du har loggat in.',
     'show_slugs_instructions' => 'Om sniglar ska visas i trädvyn.',
-    'tab_sections_instructions' => 'Fälten i varje avsnitt kommer att grupperas i flikar. Skapa nya fält, återanvänd befintliga fält eller importera hela grupper av fält från befintliga fältuppsättningar.',
+    'tabs_instructions' => 'Fälten i varje avsnitt kommer att grupperas i flikar. Skapa nya fält, återanvänd befintliga fält eller importera hela grupper av fält från befintliga fältuppsättningar.',
     'taxonomies_blueprints_instructions' => 'Termer i denna taxonomi kan använda vilken som helst av dessa ritningar.',
     'taxonomies_collections_instructions' => 'Samlingarna som använder denna taxonomi.',
     'taxonomy_configure_handle_instructions' => 'Används för att referera till denna taxonomi på frontend. Det är inte trivialt att ändra senare.',
diff --git a/resources/lang/tr/messages.php b/resources/lang/tr/messages.php
index f001978dbfd..1c34eb051f9 100644
--- a/resources/lang/tr/messages.php
+++ b/resources/lang/tr/messages.php
@@ -171,7 +171,7 @@
     'session_expiry_logging_out_in_seconds' => 'Bir süredir aktif değilsiniz ve :saniye saniye içinde oturumunuz kapatılacak. Oturumunuzu uzatmak için tıklayın.',
     'session_expiry_new_window' => 'Yeni bir pencerede açılır. Giriş yaptıktan sonra tekrar gelin.',
     'show_slugs_instructions' => 'Ağaç görünümünde kalıcı bağlantıların gösterilip gösterilmeyeceği.',
-    'tab_sections_instructions' => 'Her bölümdeki alanlar sekmeler halinde gruplandırılacaktır. Yeni alanlar oluşturun, mevcut alanları yeniden kullanın veya mevcut alan kümelerinden tüm alan gruplarını içe aktarın.',
+    'tabs_instructions' => 'Her bölümdeki alanlar sekmeler halinde gruplandırılacaktır. Yeni alanlar oluşturun, mevcut alanları yeniden kullanın veya mevcut alan kümelerinden tüm alan gruplarını içe aktarın.',
     'taxonomies_blueprints_instructions' => 'Bu sınıflandırmadaki terimler bu planlardan herhangi birini kullanabilir.',
     'taxonomies_collections_instructions' => 'Bu taksonomiyi kullanan koleksiyonlar.',
     'taxonomies_preview_targets_instructions' => 'Canlı Önizleme\'de görüntülenebilecek URL\'ler. [Belgelerde](https://statamic.dev/live-preview#preview-targets) daha fazla bilgi edinin.',
diff --git a/resources/lang/zh_CN/messages.php b/resources/lang/zh_CN/messages.php
index 54a8f4a58a6..202d492300c 100644
--- a/resources/lang/zh_CN/messages.php
+++ b/resources/lang/zh_CN/messages.php
@@ -165,7 +165,7 @@
     'session_expiry_logging_out_in_seconds' => '您已经一段时间没有活动，将在:seconds秒内注销。单击以扩展您的会话。',
     'session_expiry_new_window' => '在一个新窗口中打开。登录后再回来。',
     'show_slugs_instructions' => '是否在树视图中显示别名。',
-    'tab_sections_instructions' => '每个区段中的字段将一起分组为标签。创建新字段，重用现有字段或从现有字段集中导入整个字段组。',
+    'tabs_instructions' => '每个区段中的字段将一起分组为标签。创建新字段，重用现有字段或从现有字段集中导入整个字段组。',
     'taxonomies_blueprints_instructions' => '该分类中的术语可以使用任何这些蓝图。',
     'taxonomies_collections_instructions' => '使用此分类的集合。',
     'taxonomies_preview_targets_instructions' => '在实时预览中可查看的 URL。 在 [文档](https://statamic.dev/live-preview#preview-targets) 中了解更多信息。',
diff --git a/resources/lang/zh_TW/messages.php b/resources/lang/zh_TW/messages.php
index 6df69845cc7..a0c53a6d6f2 100644
--- a/resources/lang/zh_TW/messages.php
+++ b/resources/lang/zh_TW/messages.php
@@ -157,7 +157,7 @@
     'session_expiry_logging_out_in_seconds' => '你已經有一段時間未進行任何動作，:seconds 秒後將被登出。按一下這裡來繼續工作階段。',
     'session_expiry_new_window' => '在新視窗中開啟。登入後再回來。',
     'show_slugs_instructions' => '控制是否要在樹狀檢視中顯示 Slug。',
-    'tab_sections_instructions' => '在各個段落中的欄位都將被分組在一起，放置於同一個頁籤內。建立新欄位、重複使用現有欄位、或是從現有欄位組匯入整組欄位。',
+    'tabs_instructions' => '在各個段落中的欄位都將被分組在一起，放置於同一個頁籤內。建立新欄位、重複使用現有欄位、或是從現有欄位組匯入整組欄位。',
     'taxonomies_blueprints_instructions' => '此分類中的字詞組可用於下列任意藍圖。',
     'taxonomies_collections_instructions' => '使用此分類的條目集。',
     'taxonomy_configure_handle_instructions' => '用於在前端參照到此分類。設定後將難以修改。',
diff --git a/resources/views/assets/containers/blueprints/edit.blade.php b/resources/views/assets/containers/blueprints/edit.blade.php
index 30255bcabb0..c89aaeb30ec 100644
--- a/resources/views/assets/containers/blueprints/edit.blade.php
+++ b/resources/views/assets/containers/blueprints/edit.blade.php
@@ -11,7 +11,7 @@
     <blueprint-builder
         action="{{ cp_route('asset-containers.blueprint.update', $container->handle()) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
-        :use-sections="false"
+        :use-tabs="false"
     ></blueprint-builder>
 
     @include('statamic::partials.docs-callout', [
diff --git a/resources/views/forms/blueprints/edit.blade.php b/resources/views/forms/blueprints/edit.blade.php
index 61ac83bb125..032a0648978 100644
--- a/resources/views/forms/blueprints/edit.blade.php
+++ b/resources/views/forms/blueprints/edit.blade.php
@@ -11,7 +11,7 @@
     <blueprint-builder
         action="{{ cp_route('forms.blueprint.update', $form->handle()) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
-        :use-sections="false"
+        :use-tabs="false"
         :is-form-blueprint="true"
     ></blueprint-builder>
 
diff --git a/resources/views/navigation/blueprints/edit.blade.php b/resources/views/navigation/blueprints/edit.blade.php
index 992cabe9abd..fb2af09835d 100644
--- a/resources/views/navigation/blueprints/edit.blade.php
+++ b/resources/views/navigation/blueprints/edit.blade.php
@@ -11,7 +11,7 @@
     <blueprint-builder
         action="{{ cp_route('navigation.blueprint.update', $nav->handle()) }}"
         :initial-blueprint="{{ json_encode($blueprintVueObject) }}"
-        :use-sections="false"
+        :use-tabs="false"
     ></blueprint-builder>
 
     @include('statamic::partials.docs-callout', [
diff --git a/src/Console/Commands/SupportZipBlueprint.php b/src/Console/Commands/SupportZipBlueprint.php
index 61d2a52c3f3..0c7a20faec7 100644
--- a/src/Console/Commands/SupportZipBlueprint.php
+++ b/src/Console/Commands/SupportZipBlueprint.php
@@ -75,7 +75,7 @@ protected function getFieldsets($blueprint)
 
     protected function getFieldsetHandles($blueprint)
     {
-        return $blueprint->sections()->map->fields()->flatMap->items()->map(function ($field) {
+        return $blueprint->tabs()->map->fields()->flatMap->items()->map(function ($field) {
             if (isset($field['import'])) {
                 return $field['import'];
             } elseif (is_string($field['field'])) {
diff --git a/src/Facades/Blueprint.php b/src/Facades/Blueprint.php
index d062b3350c4..ed1558e269b 100644
--- a/src/Facades/Blueprint.php
+++ b/src/Facades/Blueprint.php
@@ -13,7 +13,7 @@
  * @method static void delete(Blueprint $blueprint)
  * @method static \Statamic\Fields\Blueprint make($handle = null)
  * @method static \Statamic\Fields\Blueprint makeFromFields($fields)
- * @method static \Statamic\Fields\Blueprint makeFromSections($sections)
+ * @method static \Statamic\Fields\Blueprint makeFromTabs($tabs)
  *
  * @see \Statamic\Fields\Blueprint
  */
diff --git a/src/Fields/Blueprint.php b/src/Fields/Blueprint.php
index 876e70e8b4b..89765c0adc4 100644
--- a/src/Fields/Blueprint.php
+++ b/src/Fields/Blueprint.php
@@ -122,7 +122,7 @@ public function setContents(array $contents)
         $this->contents = $contents;
 
         return $this
-            ->normalizeSections()
+            ->normalizeTabs()
             ->resetFieldsCache();
     }
 
@@ -147,7 +147,7 @@ private function getContents()
     {
         $contents = $this->contents;
 
-        $contents['sections'] = $contents['sections'] ?? [
+        $contents['tabs'] = $contents['tabs'] ?? [
             'main' => ['fields' => []],
         ];
 
@@ -177,17 +177,17 @@ private function addEnsuredFieldToContents($contents, $ensured)
         $imported = false;
         $handle = $ensured['handle'];
         $config = $ensured['config'];
-        $section = $ensured['section'] ?? array_keys($contents['sections'])[0] ?? 'main';
+        $tab = $ensured['tab'] ?? array_keys($contents['tabs'])[0] ?? 'main';
         $prepend = $ensured['prepend'];
 
-        $sections = collect($contents['sections']);
+        $tabs = collect($contents['tabs']);
 
-        // Get all the fields, and mark which section they're in.
-        $allFields = $sections->flatMap(function ($section, $sectionHandle) {
-            return collect($section['fields'] ?? [])->keyBy(function ($field) {
+        // Get all the fields, and mark which tab they're in.
+        $allFields = $tabs->flatMap(function ($tab, $tabHandle) {
+            return collect($tab['fields'] ?? [])->keyBy(function ($field) {
                 return (isset($field['import'])) ? 'import:'.($field['prefix'] ?? null).$field['import'] : $field['handle'];
-            })->map(function ($field) use ($sectionHandle) {
-                $field['section'] = $sectionHandle;
+            })->map(function ($field) use ($tabHandle) {
+                $field['tab'] = $tabHandle;
 
                 return $field;
             });
@@ -206,8 +206,8 @@ private function addEnsuredFieldToContents($contents, $ensured)
         // If a field with that handle is in the contents, its either an inline field or a referenced field...
         $existingField = $allFields->get($handle);
         if ($exists = $existingField !== null) {
-            // Since it already exists, maintain the position in that section.
-            $section = $existingField['section'];
+            // Since it already exists, maintain the position in that tab.
+            $tab = $existingField['tab'];
 
             if (is_string($existingField['field'])) {
                 // If it's a string, then it's a reference field. We should merge any ensured config into the 'config'
@@ -224,7 +224,7 @@ private function addEnsuredFieldToContents($contents, $ensured)
                 $field = ['handle' => $handle, 'field' => $config];
             }
         }
-        $fields = collect($sections[$section]['fields'] ?? [])->keyBy(function ($field) {
+        $fields = collect($tabs[$tab]['fields'] ?? [])->keyBy(function ($field) {
             return (isset($field['import'])) ? 'import:'.($field['prefix'] ?? null).$field['import'] : $field['handle'];
         });
 
@@ -232,15 +232,15 @@ private function addEnsuredFieldToContents($contents, $ensured)
             if ($importedField = $importedFields->get($handle)) {
                 $importKey = 'import:'.$importedField['partial'];
                 $field = $allFields->get($importKey);
-                $section = $field['section'];
-                $fields = collect($sections[$section]['fields'])->keyBy(function ($field) {
+                $tab = $field['tab'];
+                $fields = collect($tabs[$tab]['fields'])->keyBy(function ($field) {
                     return (isset($field['import'])) ? 'import:'.$field['import'] : $field['handle'];
                 });
                 $importedConfig = $importedField['field']->config();
                 $config = array_merge($config, $importedConfig);
                 $config = Arr::except($config, array_keys($importedConfig));
                 $field['config'][$handle] = $config;
-                unset($field['section']);
+                unset($field['tab']);
                 $fields->put($importKey, $field);
                 $imported = true;
             } else {
@@ -259,7 +259,7 @@ private function addEnsuredFieldToContents($contents, $ensured)
             }
         }
 
-        $contents['sections'][$section]['fields'] = $fields->values()->all();
+        $contents['tabs'][$tab]['fields'] = $fields->values()->all();
 
         return $contents;
     }
@@ -283,10 +283,10 @@ public function parent()
         return $this->parent;
     }
 
-    public function sections(): Collection
+    public function tabs(): Collection
     {
-        return collect(Arr::get($this->contents(), 'sections', []))->map(function ($contents, $handle) {
-            return (new Section($handle))->setContents($contents);
+        return collect(Arr::get($this->contents(), 'tabs', []))->map(function ($contents, $handle) {
+            return (new Tab($handle))->setContents($contents);
         });
     }
 
@@ -299,7 +299,7 @@ public function fields(): Fields
         $fn = function () {
             $this->validateUniqueHandles();
 
-            return new Fields($this->sections()->map->fields()->flatMap->items());
+            return new Fields($this->tabs()->map->fields()->flatMap->items());
         };
 
         $fields = $this->handle() ? Blink::once($this->fieldsBlinkKey(), $fn) : $fn();
@@ -316,15 +316,15 @@ public function hasField($field)
         return $this->fields()->has($field);
     }
 
-    public function hasSection($section)
+    public function hasTab($tab)
     {
-        return $this->sections()->has($section);
+        return $this->tabs()->has($tab);
     }
 
-    public function hasFieldInSection($field, $section)
+    public function hasFieldInTab($field, $tab)
     {
-        if ($section = $this->sections()->get($section)) {
-            return $section->fields()->has($field);
+        if ($tab = $this->tabs()->get($tab)) {
+            return $tab->fields()->has($field);
         }
 
         return false;
@@ -371,7 +371,7 @@ public function toPublishArray()
         return [
             'title' => $this->title(),
             'handle' => $this->handle(),
-            'sections' => $this->sections()->map->toPublishArray()->values()->all(),
+            'tabs' => $this->tabs()->map->toPublishArray()->values()->all(),
             'empty' => $this->isEmpty(),
         ];
     }
@@ -433,36 +433,36 @@ public function delete()
         return true;
     }
 
-    public function ensureField($handle, $fieldConfig, $section = null, $prepend = false)
+    public function ensureField($handle, $fieldConfig, $tab = null, $prepend = false)
     {
-        return $this->ensureFieldInSection($handle, $fieldConfig, $section, $prepend);
+        return $this->ensureFieldInTab($handle, $fieldConfig, $tab, $prepend);
     }
 
-    public function ensureFieldInSection($handle, $config, $section, $prepend = false)
+    public function ensureFieldInTab($handle, $config, $tab, $prepend = false)
     {
         if (isset($this->ensuredFields[$handle])) {
             return $this;
         }
 
-        $this->ensuredFields[$handle] = compact('handle', 'section', 'prepend', 'config');
+        $this->ensuredFields[$handle] = compact('handle', 'tab', 'prepend', 'config');
 
         $this->resetFieldsCache();
 
         return $this;
     }
 
-    public function ensureFieldsInSection($fields, $section, $prepend = false)
+    public function ensureFieldsInTab($fields, $tab, $prepend = false)
     {
         foreach ($fields as $handle => $config) {
-            $this->ensureFieldInSection($handle, $config, $section, $prepend);
+            $this->ensureFieldInTab($handle, $config, $tab, $prepend);
         }
 
         return $this;
     }
 
-    public function ensureFieldPrepended($handle, $field, $section = null)
+    public function ensureFieldPrepended($handle, $field, $tab = null)
     {
-        return $this->ensureField($handle, $field, $section, true);
+        return $this->ensureField($handle, $field, $tab, true);
     }
 
     public function ensureFieldHasConfig($handle, $config)
@@ -471,49 +471,49 @@ public function ensureFieldHasConfig($handle, $config)
             return $this;
         }
 
-        foreach ($this->sections()->keys() as $sectionKey) {
-            if ($this->hasFieldInSection($handle, $sectionKey)) {
-                return $this->ensureFieldInSectionHasConfig($handle, $sectionKey, $config);
+        foreach ($this->tabs()->keys() as $tabKey) {
+            if ($this->hasFieldInTab($handle, $tabKey)) {
+                return $this->ensureFieldInTabHasConfig($handle, $tabKey, $config);
             }
         }
     }
 
-    public function removeField($handle, $section = null)
+    public function removeField($handle, $tab = null)
     {
         if (! $this->hasField($handle)) {
             return $this;
         }
 
-        // If a section is specified, only remove from that specific section.
-        if ($section) {
-            return $this->removeFieldFromSection($handle, $section);
+        // If a tab is specified, only remove from that specific tab.
+        if ($tab) {
+            return $this->removeFieldFromTab($handle, $tab);
         }
 
-        // Otherwise remove from any section.
-        foreach ($this->sections()->keys() as $sectionKey) {
-            if ($this->hasFieldInSection($handle, $sectionKey)) {
-                return $this->removeFieldFromSection($handle, $sectionKey);
+        // Otherwise remove from any tab.
+        foreach ($this->tabs()->keys() as $tabKey) {
+            if ($this->hasFieldInTab($handle, $tabKey)) {
+                return $this->removeFieldFromTab($handle, $tabKey);
             }
         }
     }
 
-    public function removeSection($handle)
+    public function removeTab($handle)
     {
-        if (! $this->hasSection($handle)) {
+        if (! $this->hasTab($handle)) {
             return $this;
         }
 
-        Arr::pull($this->contents['sections'], $handle);
+        Arr::pull($this->contents['tabs'], $handle);
 
         return $this->resetFieldsCache();
     }
 
-    public function removeFieldFromSection($handle, $section)
+    public function removeFieldFromTab($handle, $tab)
     {
-        $fields = collect($this->contents['sections'][$section]['fields'] ?? []);
+        $fields = collect($this->contents['tabs'][$tab]['fields'] ?? []);
 
-        // See if field already exists in section.
-        if ($this->hasFieldInSection($handle, $section)) {
+        // See if field already exists in tab.
+        if ($this->hasFieldInTab($handle, $tab)) {
             $fieldKey = $fields->search(function ($field) use ($handle) {
                 return Arr::get($field, 'handle') === $handle;
             });
@@ -522,17 +522,17 @@ public function removeFieldFromSection($handle, $section)
         }
 
         // Pull it out.
-        Arr::pull($this->contents['sections'][$section]['fields'], $fieldKey);
+        Arr::pull($this->contents['tabs'][$tab]['fields'], $fieldKey);
 
         return $this->resetFieldsCache();
     }
 
-    protected function ensureFieldInSectionHasConfig($handle, $section, $config)
+    protected function ensureFieldInTabHasConfig($handle, $tab, $config)
     {
-        $fields = collect($this->contents['sections'][$section]['fields'] ?? []);
+        $fields = collect($this->contents['tabs'][$tab]['fields'] ?? []);
 
-        // See if field already exists in section.
-        if ($this->hasFieldInSection($handle, $section)) {
+        // See if field already exists in tab.
+        if ($this->hasFieldInTab($handle, $tab)) {
             $fieldKey = $fields->search(function ($field) use ($handle) {
                 return Arr::get($field, 'handle') === $handle;
             });
@@ -541,17 +541,17 @@ protected function ensureFieldInSectionHasConfig($handle, $section, $config)
         }
 
         // Get existing field config.
-        $existingConfig = Arr::get($this->contents['sections'][$section]['fields'][$fieldKey], 'field', []);
+        $existingConfig = Arr::get($this->contents['tabs'][$tab]['fields'][$fieldKey], 'field', []);
 
         // Merge in new field config.
-        $this->contents['sections'][$section]['fields'][$fieldKey]['field'] = array_merge($existingConfig, $config);
+        $this->contents['tabs'][$tab]['fields'][$fieldKey]['field'] = array_merge($existingConfig, $config);
 
         return $this->resetFieldsCache();
     }
 
     public function validateUniqueHandles()
     {
-        $fields = $this->fieldsCache ?? new Fields($this->sections()->map->fields()->flatMap->items());
+        $fields = $this->fieldsCache ?? new Fields($this->tabs()->map->fields()->flatMap->items());
 
         $handles = $fields->resolveFields()->map->handle();
 
@@ -593,10 +593,10 @@ public function shallowAugmentedArrayKeys()
         return ['handle', 'title'];
     }
 
-    protected function normalizeSections()
+    protected function normalizeTabs()
     {
         if ($fields = Arr::pull($this->contents, 'fields')) {
-            $this->contents['sections'] = [
+            $this->contents['tabs'] = [
                 'main' => ['fields' => $fields],
             ];
         }
diff --git a/src/Fields/BlueprintRepository.php b/src/Fields/BlueprintRepository.php
index 2ec1466927e..b940bf8487e 100644
--- a/src/Fields/BlueprintRepository.php
+++ b/src/Fields/BlueprintRepository.php
@@ -107,19 +107,19 @@ public function makeFromFields($fields)
         return $this->make()->setContents(['fields' => $fields]);
     }
 
-    public function makeFromSections($sections)
+    public function makeFromTabs($tabs)
     {
-        $sections = collect($sections)->map(function ($section, $section_handle) {
-            $fields = collect($section['fields'])->map(function ($field, $handle) {
+        $tabs = collect($tabs)->map(function ($tab, $tab_handle) {
+            $fields = collect($tab['fields'])->map(function ($field, $handle) {
                 return compact('handle', 'field');
             });
 
-            $section['fields'] = $fields;
+            $tab['fields'] = $fields;
 
-            return $section;
+            return $tab;
         })->all();
 
-        return $this->make()->setContents(compact('sections'));
+        return $this->make()->setContents(compact('tabs'));
     }
 
     public function in(string $namespace)
diff --git a/src/Fields/FieldTransformer.php b/src/Fields/FieldTransformer.php
index 46d7e4d75ff..d61431f93fc 100644
--- a/src/Fields/FieldTransformer.php
+++ b/src/Fields/FieldTransformer.php
@@ -11,12 +11,12 @@ class FieldTransformer
 {
     public static function fromVue(array $submitted)
     {
-        $method = $submitted['type'].'SectionField';
+        $method = $submitted['type'].'TabField';
 
         return static::$method($submitted);
     }
 
-    private static function importSectionField(array $submitted)
+    private static function importTabField(array $submitted)
     {
         return array_filter([
             'import' => $submitted['fieldset'],
@@ -24,7 +24,7 @@ private static function importSectionField(array $submitted)
         ]);
     }
 
-    private static function inlineSectionField(array $submitted)
+    private static function inlineTabField(array $submitted)
     {
         $field = Arr::removeNullValues(array_except($submitted['config'], ['isNew']));
 
@@ -46,7 +46,7 @@ private static function inlineSectionField(array $submitted)
         ]);
     }
 
-    private static function referenceSectionField(array $submitted)
+    private static function referenceTabField(array $submitted)
     {
         $config = Arr::removeNullValues(array_only($submitted['config'], $submitted['config_overrides']));
 
diff --git a/src/Fields/Section.php b/src/Fields/Tab.php
similarity index 98%
rename from src/Fields/Section.php
rename to src/Fields/Tab.php
index f6c12d9fc3c..5ac1b02e46f 100644
--- a/src/Fields/Section.php
+++ b/src/Fields/Tab.php
@@ -5,7 +5,7 @@
 use Statamic\Support\Arr;
 use Statamic\Support\Str;
 
-class Section
+class Tab
 {
     protected $handle;
     protected $contents = [];
diff --git a/src/Fieldtypes/Bard.php b/src/Fieldtypes/Bard.php
index cea6b2fd939..69eddcd47a4 100644
--- a/src/Fieldtypes/Bard.php
+++ b/src/Fieldtypes/Bard.php
@@ -79,7 +79,7 @@ protected function configFieldItems(): array
                 'display' => __('Sets'),
                 'instructions' => __('statamic::fieldtypes.bard.config.sets'),
                 'type' => 'sets',
-                'require_section' => false,
+                'require_tab' => false,
             ],
             'buttons' => [
                 'display' => __('Buttons'),
diff --git a/src/Globals/Variables.php b/src/Globals/Variables.php
index ead1371be4c..3555c88204b 100644
--- a/src/Globals/Variables.php
+++ b/src/Globals/Variables.php
@@ -131,7 +131,7 @@ protected function fallbackBlueprint()
             });
 
         return (new \Statamic\Fields\Blueprint)->setContents([
-            'sections' => [
+            'tabs' => [
                 'main' => [
                     'fields' => array_values($fields->all()),
                 ],
diff --git a/src/Http/Controllers/CP/Assets/AssetContainerBlueprintController.php b/src/Http/Controllers/CP/Assets/AssetContainerBlueprintController.php
index dce08fa3d6e..5f7281a8934 100644
--- a/src/Http/Controllers/CP/Assets/AssetContainerBlueprintController.php
+++ b/src/Http/Controllers/CP/Assets/AssetContainerBlueprintController.php
@@ -28,7 +28,7 @@ public function edit($container)
 
     public function update(Request $request, $container)
     {
-        $request->validate(['sections' => 'array']);
+        $request->validate(['tabs' => 'array']);
 
         $this->updateBlueprint($request, $container->blueprint());
     }
diff --git a/src/Http/Controllers/CP/Assets/AssetContainersController.php b/src/Http/Controllers/CP/Assets/AssetContainersController.php
index 391060bcc5d..d0185f3c398 100644
--- a/src/Http/Controllers/CP/Assets/AssetContainersController.php
+++ b/src/Http/Controllers/CP/Assets/AssetContainersController.php
@@ -301,7 +301,7 @@ protected function formBlueprint($container = null)
             ],
         ]);
 
-        return Blueprint::makeFromSections($fields);
+        return Blueprint::makeFromTabs($fields);
     }
 
     private function expandedGlidePresetOptions()
diff --git a/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php b/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php
index 0a1e0af4e7c..92426a0f66c 100644
--- a/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionBlueprintsController.php
@@ -49,7 +49,7 @@ public function update(Request $request, $collection, $blueprint)
     {
         $request->validate([
             'title' => 'required',
-            'sections' => 'array',
+            'tabs' => 'array',
         ]);
 
         $this->updateBlueprint($request, $collection->entryBlueprint($blueprint));
diff --git a/src/Http/Controllers/CP/Collections/CollectionsController.php b/src/Http/Controllers/CP/Collections/CollectionsController.php
index 041bca2e396..9da73916d64 100644
--- a/src/Http/Controllers/CP/Collections/CollectionsController.php
+++ b/src/Http/Controllers/CP/Collections/CollectionsController.php
@@ -539,6 +539,6 @@ protected function editFormBlueprint($collection)
             ],
         ]);
 
-        return Blueprint::makeFromSections($fields);
+        return Blueprint::makeFromTabs($fields);
     }
 }
diff --git a/src/Http/Controllers/CP/Fields/ManagesBlueprints.php b/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
index ddf97e22cc2..1ff7f870c68 100644
--- a/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
+++ b/src/Http/Controllers/CP/Fields/ManagesBlueprints.php
@@ -20,7 +20,7 @@ private function indexItems(Collection $blueprints, $item)
                 'id' => $blueprint->handle(),
                 'handle' => $blueprint->handle(),
                 'title' => $blueprint->title(),
-                'sections' => $blueprint->sections()->count(),
+                'tabs' => $blueprint->tabs()->count(),
                 'fields' => $blueprint->fields()->all()->count(),
                 'hidden' => $blueprint->hidden(),
                 'edit_url' => $this->editUrl($item, $blueprint),
@@ -31,10 +31,10 @@ private function indexItems(Collection $blueprints, $item)
 
     private function setBlueprintContents(Request $request, Blueprint $blueprint)
     {
-        $sections = collect($request->sections)->mapWithKeys(function ($section) {
-            return [array_pull($section, 'handle') => [
-                'display' => $section['display'],
-                'fields' => $this->sectionFields($section['fields']),
+        $tabs = collect($request->tabs)->mapWithKeys(function ($tab) {
+            return [array_pull($tab, 'handle') => [
+                'display' => $tab['display'],
+                'fields' => $this->tabFields($tab['fields']),
             ]];
         })->all();
 
@@ -42,7 +42,7 @@ private function setBlueprintContents(Request $request, Blueprint $blueprint)
             ->setHidden($request->hidden)
             ->setContents(array_merge($blueprint->contents(), array_filter([
                 'title' => $request->title,
-                'sections' => $sections,
+                'tabs' => $tabs,
             ])));
 
         return $blueprint;
@@ -54,7 +54,7 @@ private function validateUniqueHandles($blueprint)
             $blueprint->validateUniqueHandles();
         } catch (DuplicateFieldException $exception) {
             throw ValidationException::withMessages([
-                'sections' => __('statamic::validation.duplicate_field_handle', ['handle' => $exception->getHandle()]),
+                'tabs' => __('statamic::validation.duplicate_field_handle', ['handle' => $exception->getHandle()]),
             ]);
         }
     }
@@ -68,7 +68,7 @@ private function updateBlueprint($request, $blueprint)
         $blueprint->save();
     }
 
-    private function sectionFields(array $fields)
+    private function tabFields(array $fields)
     {
         return collect($fields)->map(function ($field) {
             return FieldTransformer::fromVue($field);
@@ -81,18 +81,18 @@ private function toVueObject(Blueprint $blueprint): array
             'title' => $blueprint->title(),
             'handle' => $blueprint->handle(),
             'hidden' => $blueprint->hidden(),
-            'sections' => $blueprint->sections()->map(function ($section, $i) {
-                return array_merge($this->sectionToVue($section), ['_id' => $i]);
+            'tabs' => $blueprint->tabs()->map(function ($tab, $i) {
+                return array_merge($this->tabToVue($tab), ['_id' => $i]);
             })->values()->all(),
         ];
     }
 
-    private function sectionToVue($section): array
+    private function tabToVue($tab): array
     {
         return [
-            'handle' => $section->handle(),
-            'display' => $section->display(),
-            'fields' => collect($section->contents()['fields'])->map(function ($field, $i) {
+            'handle' => $tab->handle(),
+            'display' => $tab->display(),
+            'fields' => collect($tab->contents()['fields'])->map(function ($field, $i) {
                 return array_merge(FieldTransformer::toVue($field), ['_id' => $i]);
             })->all(),
         ];
@@ -111,7 +111,7 @@ private function storeBlueprint(Request $request, string $namespace)
             ->setNamespace($namespace)
             ->setContents([
                 'title' => $request->title,
-                'sections' => [
+                'tabs' => [
                     'main' => [
                         'display' => __('Main'),
                         'fields' => [],
diff --git a/src/Http/Controllers/CP/Forms/FormBlueprintController.php b/src/Http/Controllers/CP/Forms/FormBlueprintController.php
index 9fcdf1021d9..5745c074503 100644
--- a/src/Http/Controllers/CP/Forms/FormBlueprintController.php
+++ b/src/Http/Controllers/CP/Forms/FormBlueprintController.php
@@ -28,7 +28,7 @@ public function edit($form)
 
     public function update(Request $request, $form)
     {
-        $request->validate(['sections' => 'array']);
+        $request->validate(['tabs' => 'array']);
 
         $this->updateBlueprint($request, $form->blueprint());
     }
diff --git a/src/Http/Controllers/CP/Forms/FormsController.php b/src/Http/Controllers/CP/Forms/FormsController.php
index da0ae5c8b8f..c1156ce9c54 100644
--- a/src/Http/Controllers/CP/Forms/FormsController.php
+++ b/src/Http/Controllers/CP/Forms/FormsController.php
@@ -190,7 +190,7 @@ public function destroy($form)
 
     protected function editFormBlueprint($form)
     {
-        return Blueprint::makeFromSections([
+        return Blueprint::makeFromTabs([
             'name' => [
                 'display' => __('Name'),
                 'fields' => [
diff --git a/src/Http/Controllers/CP/Globals/GlobalsBlueprintController.php b/src/Http/Controllers/CP/Globals/GlobalsBlueprintController.php
index 43226a03a11..be27d96634e 100644
--- a/src/Http/Controllers/CP/Globals/GlobalsBlueprintController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalsBlueprintController.php
@@ -37,7 +37,7 @@ public function update(Request $request, $set)
             return $this->pageNotFound();
         }
 
-        $request->validate(['sections' => 'array']);
+        $request->validate(['tabs' => 'array']);
 
         $this->updateBlueprint($request, $this->blueprint($set));
     }
diff --git a/src/Http/Controllers/CP/Globals/GlobalsController.php b/src/Http/Controllers/CP/Globals/GlobalsController.php
index 84321fb8e8c..6e9481b17ad 100644
--- a/src/Http/Controllers/CP/Globals/GlobalsController.php
+++ b/src/Http/Controllers/CP/Globals/GlobalsController.php
@@ -214,6 +214,6 @@ protected function editFormBlueprint($set)
             ];
         }
 
-        return Blueprint::makeFromSections($fields);
+        return Blueprint::makeFromTabs($fields);
     }
 }
diff --git a/src/Http/Controllers/CP/Navigation/NavigationBlueprintController.php b/src/Http/Controllers/CP/Navigation/NavigationBlueprintController.php
index c0d3006e083..e8f0ab8534c 100644
--- a/src/Http/Controllers/CP/Navigation/NavigationBlueprintController.php
+++ b/src/Http/Controllers/CP/Navigation/NavigationBlueprintController.php
@@ -37,7 +37,7 @@ public function update(Request $request, $nav)
             return $this->pageNotFound();
         }
 
-        $request->validate(['sections' => 'array']);
+        $request->validate(['tabs' => 'array']);
 
         $this->updateBlueprint($request, $nav->blueprint());
     }
diff --git a/src/Http/Controllers/CP/Navigation/NavigationController.php b/src/Http/Controllers/CP/Navigation/NavigationController.php
index 6db17ffc1cb..4a92c1c3eab 100644
--- a/src/Http/Controllers/CP/Navigation/NavigationController.php
+++ b/src/Http/Controllers/CP/Navigation/NavigationController.php
@@ -209,7 +209,7 @@ public function editFormBlueprint($nav)
             ];
         }
 
-        return Blueprint::makeFromSections($contents);
+        return Blueprint::makeFromTabs($contents);
     }
 
     public function destroy($nav)
diff --git a/src/Http/Controllers/CP/Preferences/ManagesPreferences.php b/src/Http/Controllers/CP/Preferences/ManagesPreferences.php
index aa237ac6d46..46f3dbfb850 100644
--- a/src/Http/Controllers/CP/Preferences/ManagesPreferences.php
+++ b/src/Http/Controllers/CP/Preferences/ManagesPreferences.php
@@ -49,7 +49,7 @@ protected function updatePreferences(Request $request, $item)
 
     private function blueprint()
     {
-        return Blueprint::makeFromSections(Preference::sections());
+        return Blueprint::makeFromTabs(Preference::tabs());
     }
 
     private function getSaveAsOptions()
diff --git a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
index 2b88165c9cc..8a0a8b77ab7 100644
--- a/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TaxonomiesController.php
@@ -299,6 +299,6 @@ protected function editFormBlueprint($taxonomy)
             ],
         ]);
 
-        return Blueprint::makeFromSections($fields);
+        return Blueprint::makeFromTabs($fields);
     }
 }
diff --git a/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php b/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php
index b70fb9e3756..b2fd755b4c6 100644
--- a/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php
+++ b/src/Http/Controllers/CP/Taxonomies/TaxonomyBlueprintsController.php
@@ -49,7 +49,7 @@ public function update(Request $request, $taxonomy, $blueprint)
     {
         $request->validate([
             'title' => 'required',
-            'sections' => 'array',
+            'tabs' => 'array',
         ]);
 
         $this->updateBlueprint($request, $taxonomy->termBlueprint($blueprint));
diff --git a/src/Http/Controllers/CP/Users/UserBlueprintController.php b/src/Http/Controllers/CP/Users/UserBlueprintController.php
index 2db24862139..3a3c6caedef 100644
--- a/src/Http/Controllers/CP/Users/UserBlueprintController.php
+++ b/src/Http/Controllers/CP/Users/UserBlueprintController.php
@@ -28,7 +28,7 @@ public function edit()
 
     public function update(Request $request)
     {
-        $request->validate(['sections' => 'array']);
+        $request->validate(['tabs' => 'array']);
 
         $this->updateBlueprint($request, User::make()->blueprint());
     }
diff --git a/src/Preferences/Preference.php b/src/Preferences/Preference.php
index 09754315143..4e3574d0210 100644
--- a/src/Preferences/Preference.php
+++ b/src/Preferences/Preference.php
@@ -6,7 +6,7 @@ class Preference
 {
     protected $handle;
     protected $field;
-    protected $section = 'general';
+    protected $tab = 'general';
 
     public function handle(string $handle = null)
     {
@@ -30,13 +30,13 @@ public function field(array $field = null)
         return $this;
     }
 
-    public function section(string $section = null)
+    public function tab(string $tab = null)
     {
         if (func_num_args() === 0) {
-            return $this->section;
+            return $this->tab;
         }
 
-        $this->section = $section;
+        $this->tab = $tab;
 
         return $this;
     }
diff --git a/src/Preferences/Preferences.php b/src/Preferences/Preferences.php
index 2e769a56458..3b5e5d2d18a 100644
--- a/src/Preferences/Preferences.php
+++ b/src/Preferences/Preferences.php
@@ -12,8 +12,8 @@ class Preferences
     protected $dotted = [];
     protected $preventMergingChildren = [];
     protected $fields = [];
-    protected $sections = [];
-    protected $pendingSection = null;
+    protected $tabs = [];
+    protected $pendingTab = null;
     protected $extensions = [];
 
     /**
@@ -172,10 +172,10 @@ public function boot()
             $return = $callback($this);
 
             if (is_array($return)) {
-                foreach ($return as $handle => $section) {
-                    $display = $this->sections[$handle] ?? $section['display'] ?? $handle;
-                    $this->section($handle, $display, function () use ($section) {
-                        foreach ($section['fields'] as $handle => $field) {
+                foreach ($return as $handle => $tab) {
+                    $display = $this->tabs[$handle] ?? $tab['display'] ?? $handle;
+                    $this->tab($handle, $display, function () use ($tab) {
+                        foreach ($tab['fields'] as $handle => $field) {
                             $this->register($handle, $field);
                         }
                     });
@@ -199,39 +199,39 @@ public function make(string $handle, array $field = [])
     {
         $preference = (new Preference)->handle($handle)->field($field);
 
-        if ($this->pendingSection) {
-            $preference->section($this->pendingSection);
+        if ($this->pendingTab) {
+            $preference->tab($this->pendingTab);
         }
 
         return $preference;
     }
 
-    public function sections()
+    public function tabs()
     {
         return collect($this->fields)
-            ->groupBy->section()
-            ->map(fn ($fields, $section) => [
-                'display' => $this->sections[$section] ?? __('General'),
+            ->groupBy->tab()
+            ->map(fn ($fields, $tab) => [
+                'display' => $this->tabs[$tab] ?? __('General'),
                 'fields' => $fields->keyBy->handle()->map->field()->all(),
             ]);
     }
 
-    public function section($handle, $label, $permissions = null)
+    public function tab($handle, $label, $permissions = null)
     {
-        throw_if($this->pendingSection, new \Exception('Cannot nest preference sections'));
+        throw_if($this->pendingTab, new \Exception('Cannot nest preference tabs'));
 
         if (func_num_args() === 3) {
-            $this->sections[$handle] = $label;
+            $this->tabs[$handle] = $label;
         }
 
         if (func_num_args() === 2) {
             $permissions = $label;
         }
 
-        $this->pendingSection = $handle;
+        $this->pendingTab = $handle;
 
         $permissions($this);
 
-        $this->pendingSection = null;
+        $this->pendingTab = null;
     }
 }
diff --git a/tests/Antlers/ParserTestCase.php b/tests/Antlers/ParserTestCase.php
index e95acbde1c7..24c037997b7 100644
--- a/tests/Antlers/ParserTestCase.php
+++ b/tests/Antlers/ParserTestCase.php
@@ -85,7 +85,7 @@ protected function setupTestBlueprintAndFields()
     {
         if (self::$testBlueprint == null) {
             $blueprintContents = YAML::parse(file_get_contents(__DIR__.'/../__fixtures__/blueprints/article.yaml'));
-            $blueprintFields = collect($blueprintContents['sections']['main']['fields'])->keyBy(function ($item) {
+            $blueprintFields = collect($blueprintContents['tabs']['main']['fields'])->keyBy(function ($item) {
                 return $item['handle'];
             })->map(function ($item) {
                 return $item['field'];
diff --git a/tests/Auth/AugmentedUserTest.php b/tests/Auth/AugmentedUserTest.php
index 11afc260c4f..fedb37186c5 100644
--- a/tests/Auth/AugmentedUserTest.php
+++ b/tests/Auth/AugmentedUserTest.php
@@ -22,7 +22,7 @@ public function it_gets_values()
 
         $blueprint = User::blueprint();
         $contents = $blueprint->contents();
-        $contents['sections']['main']['fields'] = array_merge($contents['sections']['main']['fields'], [
+        $contents['tabs']['main']['fields'] = array_merge($contents['tabs']['main']['fields'], [
             ['handle' => 'two', 'field' => ['type' => 'text']],
             ['handle' => 'four', 'field' => ['type' => 'text']],
             ['handle' => 'unused_in_bp', 'field' => ['type' => 'text']],
diff --git a/tests/Factories/FieldsetFactory.php b/tests/Factories/FieldsetFactory.php
index cb06320a643..18a8e4333e1 100644
--- a/tests/Factories/FieldsetFactory.php
+++ b/tests/Factories/FieldsetFactory.php
@@ -15,13 +15,13 @@ public function withContents($contents)
         return $this;
     }
 
-    public function withSections($sections)
+    public function withTabs($tabs)
     {
         if (! $this->contents) {
             $this->contents = [];
         }
 
-        $this->contents['sections'] = $sections;
+        $this->contents['tabs'] = $tabs;
 
         return $this;
     }
diff --git a/tests/Feature/Collections/Blueprints/StoreBlueprintTest.php b/tests/Feature/Collections/Blueprints/StoreBlueprintTest.php
index 862f04e9ee5..1814913f8c5 100644
--- a/tests/Feature/Collections/Blueprints/StoreBlueprintTest.php
+++ b/tests/Feature/Collections/Blueprints/StoreBlueprintTest.php
@@ -61,7 +61,7 @@ public function blueprint_gets_created()
         $this->assertEquals('my_test_blueprint', $blueprint->handle());
         $this->assertEquals([
             'title' => 'My Test Blueprint',
-            'sections' => [
+            'tabs' => [
                 'main' => [
                     'display' => 'Main',
                     'fields' => [],
diff --git a/tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php b/tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php
index 7f9ff6abf3b..77785abde40 100644
--- a/tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php
+++ b/tests/Feature/Collections/Blueprints/UpdateBlueprintTest.php
@@ -71,11 +71,11 @@ public function blueprint_gets_saved()
             ->actingAs($user)
             ->submit($collection, $blueprint, [
                 'title' => 'Updated title',
-                'sections' => [
+                'tabs' => [
                     [
                         '_id' => 'id-one',
                         'handle' => 'one',
-                        'display' => 'Section One',
+                        'display' => 'Tab One',
                         'fields' => [
                             [
                                 '_id' => 'id-s1-f1',
@@ -106,9 +106,9 @@ public function blueprint_gets_saved()
         $this->assertEquals([
             'title' => 'Updated title',
             'foo' => 'bar',
-            'sections' => [
+            'tabs' => [
                 'one' => [
-                    'display' => 'Section One',
+                    'display' => 'Tab One',
                     'fields' => [
                         [
                             'handle' => 'title',
@@ -168,7 +168,7 @@ public function title_is_required()
     }
 
     /** @test */
-    public function sections_are_required()
+    public function tabs_are_required()
     {
         $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
         $user = tap(Facades\User::make()->assignRole('test'))->save();
@@ -180,15 +180,15 @@ public function sections_are_required()
         $this
             ->from('/original')
             ->actingAs($user)
-            ->submit($collection, $blueprint, ['sections' => ''])
+            ->submit($collection, $blueprint, ['tabs' => ''])
             ->assertRedirect('/original')
-            ->assertSessionHasErrors('sections');
+            ->assertSessionHasErrors('tabs');
 
         $this->assertEquals($originalContents, Facades\Blueprint::find('collections.test.test')->contents());
     }
 
     /** @test */
-    public function sections_must_be_an_array()
+    public function tabs_must_be_an_array()
     {
         $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
         $user = tap(Facades\User::make()->assignRole('test'))->save();
@@ -200,9 +200,9 @@ public function sections_must_be_an_array()
         $this
             ->from('/original')
             ->actingAs($user)
-            ->submit($collection, $blueprint, ['sections' => 'string'])
+            ->submit($collection, $blueprint, ['tabs' => 'string'])
             ->assertRedirect('/original')
-            ->assertSessionHasErrors('sections');
+            ->assertSessionHasErrors('tabs');
 
         $this->assertEquals($originalContents, Facades\Blueprint::find('collections.test.test')->contents());
     }
@@ -232,11 +232,11 @@ public function width_of_100_gets_stripped_out_for_inline_fields_but_left_in_for
             ->actingAs($user)
             ->submit($collection, $blueprint, [
                 'title' => 'Updated title',
-                'sections' => [
+                'tabs' => [
                     [
                         '_id' => 'id-one',
                         'handle' => 'one',
-                        'display' => 'Section One',
+                        'display' => 'Tab One',
                         'fields' => [
                             [
                                 '_id' => 'id-s1-f1',
@@ -275,9 +275,9 @@ public function width_of_100_gets_stripped_out_for_inline_fields_but_left_in_for
 
         $this->assertEquals([
             'title' => 'Updated title',
-            'sections' => [
+            'tabs' => [
                 'one' => [
-                    'display' => 'Section One',
+                    'display' => 'Tab One',
                     'fields' => [
                         [
                             'handle' => 'title',
@@ -348,11 +348,11 @@ public function localizable_of_false_gets_stripped_out_for_inline_fields_but_lef
             ->actingAs($user)
             ->submit($collection, $blueprint, [
                 'title' => 'Updated title',
-                'sections' => [
+                'tabs' => [
                     [
                         '_id' => 'id-one',
                         'handle' => 'one',
-                        'display' => 'Section One',
+                        'display' => 'Tab One',
                         'fields' => [
                             [
                                 '_id' => 'id-s1-f1',
@@ -391,9 +391,9 @@ public function localizable_of_false_gets_stripped_out_for_inline_fields_but_lef
 
         $this->assertEquals([
             'title' => 'Updated title',
-            'sections' => [
+            'tabs' => [
                 'one' => [
-                    'display' => 'Section One',
+                    'display' => 'Tab One',
                     'fields' => [
                         [
                             'handle' => 'title',
@@ -451,7 +451,7 @@ private function validParams($overrides = [])
     {
         return array_merge([
             'title' => 'Updated',
-            'sections' => [],
+            'tabs' => [],
         ], $overrides);
     }
 }
diff --git a/tests/Feature/Collections/Blueprints/ViewBlueprintListingTest.php b/tests/Feature/Collections/Blueprints/ViewBlueprintListingTest.php
index 3d332908236..315f6ba5bdf 100644
--- a/tests/Feature/Collections/Blueprints/ViewBlueprintListingTest.php
+++ b/tests/Feature/Collections/Blueprints/ViewBlueprintListingTest.php
@@ -39,7 +39,7 @@ public function it_shows_a_list_of_blueprints()
                     'id' => 'foo',
                     'handle' => 'foo',
                     'title' => 'Foo',
-                    'sections' => 2,
+                    'tabs' => 2,
                     'fields' => 2,
                     'hidden' => false,
                     'edit_url' => 'http://localhost/cp/collections/test/blueprints/foo/edit',
@@ -49,7 +49,7 @@ public function it_shows_a_list_of_blueprints()
                     'id' => 'bar',
                     'handle' => 'bar',
                     'title' => 'Bar',
-                    'sections' => 2,
+                    'tabs' => 2,
                     'fields' => 2,
                     'hidden' => false,
                     'edit_url' => 'http://localhost/cp/collections/test/blueprints/bar/edit',
diff --git a/tests/Feature/Taxonomies/Blueprints/StoreBlueprintTest.php b/tests/Feature/Taxonomies/Blueprints/StoreBlueprintTest.php
index 201e1ca8af2..5d6b534c026 100644
--- a/tests/Feature/Taxonomies/Blueprints/StoreBlueprintTest.php
+++ b/tests/Feature/Taxonomies/Blueprints/StoreBlueprintTest.php
@@ -61,7 +61,7 @@ public function blueprint_gets_created()
         $this->assertEquals('my_test_blueprint', $blueprint->handle());
         $this->assertEquals([
             'title' => 'My Test Blueprint',
-            'sections' => [
+            'tabs' => [
                 'main' => [
                     'display' => 'Main',
                     'fields' => [],
diff --git a/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php b/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php
index b4ab6bacd8e..4602eefca17 100644
--- a/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php
+++ b/tests/Feature/Taxonomies/Blueprints/UpdateBlueprintTest.php
@@ -71,11 +71,11 @@ public function blueprint_gets_saved()
             ->actingAs($user)
             ->submit($collection, $blueprint, [
                 'title' => 'Updated title',
-                'sections' => [
+                'tabs' => [
                     [
                         '_id' => 'id-one',
                         'handle' => 'one',
-                        'display' => 'Section One',
+                        'display' => 'Tab One',
                         'fields' => [
                             [
                                 '_id' => 'id-s1-f1',
@@ -106,9 +106,9 @@ public function blueprint_gets_saved()
         $this->assertEquals([
             'title' => 'Updated title',
             'foo' => 'bar',
-            'sections' => [
+            'tabs' => [
                 'one' => [
-                    'display' => 'Section One',
+                    'display' => 'Tab One',
                     'fields' => [
                         [
                             'handle' => 'title',
@@ -168,7 +168,7 @@ public function title_is_required()
     }
 
     /** @test */
-    public function sections_are_required()
+    public function tabs_are_required()
     {
         $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
         $user = tap(Facades\User::make()->assignRole('test'))->save();
@@ -180,15 +180,15 @@ public function sections_are_required()
         $this
             ->from('/original')
             ->actingAs($user)
-            ->submit($collection, $blueprint, ['sections' => ''])
+            ->submit($collection, $blueprint, ['tabs' => ''])
             ->assertRedirect('/original')
-            ->assertSessionHasErrors('sections');
+            ->assertSessionHasErrors('tabs');
 
         $this->assertEquals($originalContents, Facades\Blueprint::find('taxonomies.test.test')->contents());
     }
 
     /** @test */
-    public function sections_must_be_an_array()
+    public function tabs_must_be_an_array()
     {
         $this->setTestRoles(['test' => ['access cp', 'configure fields']]);
         $user = tap(Facades\User::make()->assignRole('test'))->save();
@@ -200,9 +200,9 @@ public function sections_must_be_an_array()
         $this
             ->from('/original')
             ->actingAs($user)
-            ->submit($collection, $blueprint, ['sections' => 'string'])
+            ->submit($collection, $blueprint, ['tabs' => 'string'])
             ->assertRedirect('/original')
-            ->assertSessionHasErrors('sections');
+            ->assertSessionHasErrors('tabs');
 
         $this->assertEquals($originalContents, Facades\Blueprint::find('taxonomies.test.test')->contents());
     }
@@ -232,11 +232,11 @@ public function width_of_100_gets_stripped_out_for_inline_fields_but_left_in_for
             ->actingAs($user)
             ->submit($collection, $blueprint, [
                 'title' => 'Updated title',
-                'sections' => [
+                'tabs' => [
                     [
                         '_id' => 'id-one',
                         'handle' => 'one',
-                        'display' => 'Section One',
+                        'display' => 'Tab One',
                         'fields' => [
                             [
                                 '_id' => 'id-s1-f1',
@@ -275,9 +275,9 @@ public function width_of_100_gets_stripped_out_for_inline_fields_but_left_in_for
 
         $this->assertEquals([
             'title' => 'Updated title',
-            'sections' => [
+            'tabs' => [
                 'one' => [
-                    'display' => 'Section One',
+                    'display' => 'Tab One',
                     'fields' => [
                         [
                             'handle' => 'title',
@@ -335,7 +335,7 @@ private function validParams($overrides = [])
     {
         return array_merge([
             'title' => 'Updated',
-            'sections' => [],
+            'tabs' => [],
         ], $overrides);
     }
 }
diff --git a/tests/Feature/Taxonomies/Blueprints/ViewBlueprintListingTest.php b/tests/Feature/Taxonomies/Blueprints/ViewBlueprintListingTest.php
index 2e92938bf7b..4bb4e0804d8 100644
--- a/tests/Feature/Taxonomies/Blueprints/ViewBlueprintListingTest.php
+++ b/tests/Feature/Taxonomies/Blueprints/ViewBlueprintListingTest.php
@@ -38,7 +38,7 @@ public function it_shows_a_list_of_blueprints()
                     'id' => 'foo',
                     'handle' => 'foo',
                     'title' => 'Foo',
-                    'sections' => 2,
+                    'tabs' => 2,
                     'fields' => 2,
                     'hidden' => false,
                     'edit_url' => 'http://localhost/cp/taxonomies/test/blueprints/foo/edit',
@@ -48,7 +48,7 @@ public function it_shows_a_list_of_blueprints()
                     'id' => 'bar',
                     'handle' => 'bar',
                     'title' => 'Bar',
-                    'sections' => 2,
+                    'tabs' => 2,
                     'fields' => 2,
                     'hidden' => false,
                     'edit_url' => 'http://localhost/cp/taxonomies/test/blueprints/bar/edit',
diff --git a/tests/Fields/BlueprintRepositoryTest.php b/tests/Fields/BlueprintRepositoryTest.php
index 55deb4119a8..74e6813004b 100644
--- a/tests/Fields/BlueprintRepositoryTest.php
+++ b/tests/Fields/BlueprintRepositoryTest.php
@@ -29,7 +29,7 @@ public function it_gets_a_blueprint()
     {
         $contents = <<<'EOT'
 title: Test
-sections:
+tabs:
   main:
     fields:
       - one
@@ -45,7 +45,7 @@ public function it_gets_a_blueprint()
         $this->assertNull($blueprint->namespace());
         $this->assertEquals([
             'title' => 'Test',
-            'sections' => [
+            'tabs' => [
                 'main' => [
                     'fields' => ['one', 'two'],
                 ],
@@ -58,7 +58,7 @@ public function it_gets_a_blueprint_in_a_namespace()
     {
         $contents = <<<'EOT'
 title: Test
-sections:
+tabs:
   main:
     fields:
       - one
@@ -74,7 +74,7 @@ public function it_gets_a_blueprint_in_a_namespace()
         $this->assertEquals('foo.bar', $blueprint->namespace());
         $this->assertEquals([
             'title' => 'Test',
-            'sections' => [
+            'tabs' => [
                 'main' => [
                     'fields' => ['one', 'two'],
                 ],
@@ -146,7 +146,7 @@ public function it_saves_to_disk()
     {
         $expectedYaml = <<<'EOT'
 title: 'Test Blueprint'
-sections:
+tabs:
   one:
     display: One
     fields:
@@ -169,7 +169,7 @@ public function it_saves_to_disk()
 
         $blueprint = (new Blueprint)->setHandle('the_test_blueprint')->setContents([
             'title' => 'Test Blueprint',
-            'sections' => [
+            'tabs' => [
                 'one' => [
                     'display' => 'One',
                     'fields' => [
diff --git a/tests/Fields/BlueprintTest.php b/tests/Fields/BlueprintTest.php
index 7a53fc0cd04..6ee286337f9 100644
--- a/tests/Fields/BlueprintTest.php
+++ b/tests/Fields/BlueprintTest.php
@@ -20,7 +20,7 @@
 use Statamic\Fields\Field;
 use Statamic\Fields\Fields;
 use Statamic\Fields\Fieldset;
-use Statamic\Fields\Section;
+use Statamic\Fields\Tab;
 use Tests\TestCase;
 
 class BlueprintTest extends TestCase
@@ -41,10 +41,10 @@ public function it_gets_the_handle()
     public function it_gets_contents()
     {
         $blueprint = new Blueprint;
-        $this->assertEquals(['sections' => ['main' => ['fields' => []]]], $blueprint->contents());
+        $this->assertEquals(['tabs' => ['main' => ['fields' => []]]], $blueprint->contents());
 
         $contents = [
-            'sections' => [
+            'tabs' => [
                 'main' => [
                     'fields' => [
                         ['handle' => 'one', 'field' => ['type' => 'text']],
@@ -94,20 +94,20 @@ public function the_title_falls_back_to_a_humanized_handle()
     }
 
     /** @test */
-    public function it_gets_sections()
+    public function it_gets_tabs()
     {
         $blueprint = new Blueprint;
-        tap($blueprint->sections(), function ($sections) {
-            $this->assertInstanceOf(Collection::class, $sections);
-            $this->assertCount(1, $sections);
+        tap($blueprint->tabs(), function ($tabs) {
+            $this->assertInstanceOf(Collection::class, $tabs);
+            $this->assertCount(1, $tabs);
         });
 
         $contents = [
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => ['one' => ['type' => 'text']],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => ['two' => ['type' => 'text']],
                 ],
             ],
@@ -115,18 +115,18 @@ public function it_gets_sections()
 
         $blueprint->setContents($contents);
 
-        tap($blueprint->sections(), function ($sections) {
-            $this->assertCount(2, $sections);
-            $this->assertEveryItemIsInstanceOf(Section::class, $sections);
-            $this->assertEquals(['section_one', 'section_two'], $sections->map->handle()->values()->all());
+        tap($blueprint->tabs(), function ($tabs) {
+            $this->assertCount(2, $tabs);
+            $this->assertEveryItemIsInstanceOf(Tab::class, $tabs);
+            $this->assertEquals(['tab_one', 'tab_two'], $tabs->map->handle()->values()->all());
         });
     }
 
     /** @test */
-    public function it_puts_top_level_fields_into_a_main_section()
+    public function it_puts_top_level_fields_into_a_main_tab()
     {
         $blueprint = new Blueprint;
-        $this->assertEquals(['sections' => ['main' => ['fields' => []]]], $blueprint->contents());
+        $this->assertEquals(['tabs' => ['main' => ['fields' => []]]], $blueprint->contents());
 
         $blueprint->setContents([
             'fields' => [
@@ -138,7 +138,7 @@ public function it_puts_top_level_fields_into_a_main_section()
         ]);
 
         $this->assertEquals([
-            'sections' => [
+            'tabs' => [
                 'main' => [
                     'fields' => [
                         [
@@ -165,15 +165,15 @@ public function it_can_check_if_has_field()
                 ],
             ]));
 
-        $blueprint = (new Blueprint)->setHandle('sectioned')->setContents($contents = [
+        $blueprint = (new Blueprint)->setHandle('tabbed')->setContents($contents = [
             'title' => 'Test',
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         ['handle' => 'one', 'field' => ['type' => 'text']],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         ['handle' => 'two', 'field' => ['type' => 'text']],
                         ['import' => 'partial'],
@@ -187,12 +187,12 @@ public function it_can_check_if_has_field()
         $this->assertTrue($blueprint->hasField('three'));
         $this->assertFalse($blueprint->hasField('four')); // Doesnt exist
 
-        $this->assertTrue($blueprint->hasFieldInSection('one', 'section_one'));
-        $this->assertTrue($blueprint->hasFieldInSection('two', 'section_two'));
-        $this->assertTrue($blueprint->hasFieldInSection('three', 'section_two'));
-        $this->assertFalse($blueprint->hasFieldInSection('one', 'section_two')); // In section one
-        $this->assertFalse($blueprint->hasFieldInSection('three', 'section_one')); // In section two
-        $this->assertFalse($blueprint->hasFieldInSection('four', 'section_two')); // Doesnt exist
+        $this->assertTrue($blueprint->hasFieldInTab('one', 'tab_one'));
+        $this->assertTrue($blueprint->hasFieldInTab('two', 'tab_two'));
+        $this->assertTrue($blueprint->hasFieldInTab('three', 'tab_two'));
+        $this->assertFalse($blueprint->hasFieldInTab('one', 'tab_two')); // In tab one
+        $this->assertFalse($blueprint->hasFieldInTab('three', 'tab_one')); // In tab two
+        $this->assertFalse($blueprint->hasFieldInTab('four', 'tab_two')); // Doesnt exist
     }
 
     /** @test */
@@ -212,8 +212,8 @@ public function it_gets_fields()
             ->andReturn(new Field('field_one', ['type' => 'textarea']));
 
         $blueprint->setContents($contents = [
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         [
                             'handle' => 'one',
@@ -221,7 +221,7 @@ public function it_gets_fields()
                         ],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         [
                             'handle' => 'two',
@@ -263,8 +263,8 @@ public function it_gets_columns()
             ->andReturn(new Field('field_one', ['type' => 'textarea']));
 
         $blueprint->setContents($contents = [
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         [
                             'handle' => 'one',
@@ -272,7 +272,7 @@ public function it_gets_columns()
                         ],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         [
                             'handle' => 'two',
@@ -317,8 +317,8 @@ public function converts_to_array_suitable_for_rendering_fields_in_publish_compo
 
         $blueprint = (new Blueprint)->setHandle('test')->setContents($contents = [
             'title' => 'Test',
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'instructions' => 'Does stuff',
                     'fields' => [
                         [
@@ -327,7 +327,7 @@ public function converts_to_array_suitable_for_rendering_fields_in_publish_compo
                         ],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         [
                             'handle' => 'two',
@@ -341,10 +341,10 @@ public function converts_to_array_suitable_for_rendering_fields_in_publish_compo
         $this->assertEquals([
             'title' => 'Test',
             'handle' => 'test',
-            'sections' => [
+            'tabs' => [
                 [
-                    'display' => 'Section one',
-                    'handle' => 'section_one',
+                    'display' => 'Tab one',
+                    'handle' => 'tab_one',
                     'instructions' => 'Does stuff',
                     'fields' => [
                         [
@@ -370,8 +370,8 @@ public function converts_to_array_suitable_for_rendering_fields_in_publish_compo
                     ],
                 ],
                 [
-                    'display' => 'Section two',
-                    'handle' => 'section_two',
+                    'display' => 'Tab two',
+                    'handle' => 'tab_two',
                     'instructions' => null,
                     'fields' => [
                         [
@@ -431,8 +431,8 @@ public function converts_to_array_suitable_for_rendering_prefixed_conditional_fi
 
         $blueprint = (new Blueprint)->setHandle('test')->setContents($contents = [
             'title' => 'Test',
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         ['import' => 'partial', 'prefix' => 'nested_'],
                     ],
@@ -443,10 +443,10 @@ public function converts_to_array_suitable_for_rendering_prefixed_conditional_fi
         $this->assertEquals([
             'title' => 'Test',
             'handle' => 'test',
-            'sections' => [
+            'tabs' => [
                 [
-                    'display' => 'Section one',
-                    'handle' => 'section_one',
+                    'display' => 'Tab one',
+                    'handle' => 'tab_one',
                     'instructions' => null,
                     'fields' => [
                         [
@@ -582,8 +582,8 @@ public function if_saving_event_returns_false_the_blueprint_doesnt_save()
     /** @test */
     public function it_ensures_a_field_exists()
     {
-        $blueprint = (new Blueprint)->setContents(['sections' => [
-            'section_one' => [
+        $blueprint = (new Blueprint)->setContents(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'existing', 'field' => ['type' => 'text']],
                 ],
@@ -595,8 +595,8 @@ public function it_ensures_a_field_exists()
         $this->assertEquals($blueprint, $return);
         $this->assertTrue($blueprint->hasField('existing'));
         $this->assertTrue($blueprint->hasField('new'));
-        $this->assertEquals(['sections' => [
-            'section_one' => [
+        $this->assertEquals(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'existing', 'field' => ['type' => 'text']],
                     ['handle' => 'new', 'field' => ['type' => 'textarea']],
@@ -607,28 +607,28 @@ public function it_ensures_a_field_exists()
     }
 
     /** @test */
-    public function it_ensures_a_field_exists_in_a_specific_section()
+    public function it_ensures_a_field_exists_in_a_specific_tab()
     {
-        $blueprint = (new Blueprint)->setContents(['sections' => [
-            'section_one' => [
+        $blueprint = (new Blueprint)->setContents(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'existing', 'field' => ['type' => 'text']],
                 ],
             ],
         ]]);
 
-        $return = $blueprint->ensureField('new', ['type' => 'textarea'], 'section_two');
+        $return = $blueprint->ensureField('new', ['type' => 'textarea'], 'tab_two');
 
         $this->assertEquals($blueprint, $return);
         $this->assertTrue($blueprint->hasField('existing'));
         $this->assertTrue($blueprint->hasField('new'));
-        $this->assertEquals(['sections' => [
-            'section_one' => [
+        $this->assertEquals(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'existing', 'field' => ['type' => 'text']],
                 ],
             ],
-            'section_two' => [
+            'tab_two' => [
                 'fields' => [
                     ['handle' => 'new', 'field' => ['type' => 'textarea']],
                 ],
@@ -640,14 +640,14 @@ public function it_ensures_a_field_exists_in_a_specific_section()
     /** @test */
     public function it_ensures_a_field_has_config()
     {
-        $blueprint = (new Blueprint)->setContents(['sections' => [
-            'section_one' => [
+        $blueprint = (new Blueprint)->setContents(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'title', 'field' => ['type' => 'text']],
                     ['handle' => 'author', 'field' => ['type' => 'text', 'do_not_touch_other_config' => true]],
                 ],
             ],
-            'section_two' => [
+            'tab_two' => [
                 'fields' => [
                     ['handle' => 'content', 'field' => ['type' => 'text']],
                 ],
@@ -671,8 +671,8 @@ public function it_ensures_a_field_has_config()
     /** @test */
     public function it_merges_previously_undefined_keys_into_the_config_when_ensuring_a_field_exists_and_it_already_exists()
     {
-        $blueprint = (new Blueprint)->setContents(['sections' => [
-            'section_one' => [
+        $blueprint = (new Blueprint)->setContents(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'existing', 'field' => ['type' => 'text']],
                 ],
@@ -683,8 +683,8 @@ public function it_merges_previously_undefined_keys_into_the_config_when_ensurin
 
         $this->assertEquals($blueprint, $return);
         $this->assertTrue($blueprint->hasField('existing'));
-        $this->assertEquals(['sections' => [
-            'section_one' => [
+        $this->assertEquals(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'existing', 'field' => ['type' => 'text', 'foo' => 'bar']],
                 ],
@@ -696,8 +696,8 @@ public function it_merges_previously_undefined_keys_into_the_config_when_ensurin
     /** @test */
     public function it_merges_previously_undefined_keys_into_the_config_when_ensuring_prepended_a_field_exists_and_it_already_exists()
     {
-        $blueprint = (new Blueprint)->setContents(['sections' => [
-            'section_one' => [
+        $blueprint = (new Blueprint)->setContents(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'first', 'field' => ['type' => 'text']],
                     ['handle' => 'existing', 'field' => ['type' => 'text']],
@@ -709,8 +709,8 @@ public function it_merges_previously_undefined_keys_into_the_config_when_ensurin
 
         $this->assertEquals($blueprint, $return);
         $this->assertTrue($blueprint->hasField('existing'));
-        $this->assertEquals(['sections' => [
-            'section_one' => [
+        $this->assertEquals(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'first', 'field' => ['type' => 'text']],
                     ['handle' => 'existing', 'field' => ['type' => 'text', 'foo' => 'bar']],
@@ -721,22 +721,22 @@ public function it_merges_previously_undefined_keys_into_the_config_when_ensurin
     }
 
     /** @test */
-    public function it_merges_previously_undefined_keys_into_the_config_when_ensuring_a_field_exists_and_it_already_exists_in_a_specific_section()
+    public function it_merges_previously_undefined_keys_into_the_config_when_ensuring_a_field_exists_and_it_already_exists_in_a_specific_tab()
     {
-        $blueprint = (new Blueprint)->setContents(['sections' => [
-            'section_one' => [
+        $blueprint = (new Blueprint)->setContents(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'existing', 'field' => ['type' => 'text']],
                 ],
             ],
         ]]);
 
-        $return = $blueprint->ensureField('existing', ['type' => 'textarea', 'foo' => 'bar'], 'another_section');
+        $return = $blueprint->ensureField('existing', ['type' => 'textarea', 'foo' => 'bar'], 'another_tab');
 
         $this->assertEquals($blueprint, $return);
         $this->assertTrue($blueprint->hasField('existing'));
-        $this->assertEquals(['sections' => [
-            'section_one' => [
+        $this->assertEquals(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'existing', 'field' => ['type' => 'text', 'foo' => 'bar']],
                 ],
@@ -757,8 +757,8 @@ public function it_merges_config_overrides_for_previously_undefined_keys_when_en
             ]])
         );
 
-        $blueprint = (new Blueprint)->setContents(['sections' => [
-            'section_one' => [
+        $blueprint = (new Blueprint)->setContents(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'from_partial', 'field' => 'the_partial.the_field'],
                 ],
@@ -769,8 +769,8 @@ public function it_merges_config_overrides_for_previously_undefined_keys_when_en
 
         $this->assertEquals($blueprint, $return);
         $this->assertTrue($blueprint->hasField('from_partial'));
-        $this->assertEquals(['sections' => [
-            'section_one' => [
+        $this->assertEquals(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['handle' => 'from_partial', 'field' => 'the_partial.the_field', 'config' => ['foo' => 'bar']],
                 ],
@@ -791,8 +791,8 @@ public function it_merges_undefined_config_overrides_when_ensuring_a_field_that_
             ]])
         );
 
-        $blueprint = (new Blueprint)->setContents(['sections' => [
-            'section_one' => [
+        $blueprint = (new Blueprint)->setContents(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     ['import' => 'the_partial'],
                 ],
@@ -803,8 +803,8 @@ public function it_merges_undefined_config_overrides_when_ensuring_a_field_that_
 
         $this->assertEquals($blueprint, $return);
         $this->assertTrue($blueprint->hasField('one'));
-        $this->assertEquals(['sections' => [
-            'section_one' => [
+        $this->assertEquals(['tabs' => [
+            'tab_one' => [
                 'fields' => [
                     [
                         'import' => 'the_partial',
@@ -823,13 +823,13 @@ public function it_ensures_a_field_exists_if_it_doesnt_and_prepends_it()
     {
         $blueprint = (new Blueprint)->setHandle('test')->setContents($contents = [
             'title' => 'Test',
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         ['handle' => 'one', 'field' => ['type' => 'text']],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         ['handle' => 'two', 'field' => ['type' => 'text']],
                     ],
@@ -852,17 +852,17 @@ public function it_ensures_a_field_exists_if_it_doesnt_and_prepends_it()
     }
 
     /** @test */
-    public function it_ensures_a_field_exists_in_a_given_section_if_it_doesnt_exist_at_all()
+    public function it_ensures_a_field_exists_in_a_given_tab_if_it_doesnt_exist_at_all()
     {
         $blueprint = (new Blueprint)->setHandle('test')->setContents($contents = [
             'title' => 'Test',
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         ['handle' => 'one', 'field' => ['type' => 'text']],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         ['handle' => 'two', 'field' => ['type' => 'text', 'foo' => 'bar']],
                     ],
@@ -870,17 +870,17 @@ public function it_ensures_a_field_exists_in_a_given_section_if_it_doesnt_exist_
             ],
         ]);
         $this->assertFalse($blueprint->hasField('three'));
-        $this->assertEquals(2, $blueprint->sections()->count());
+        $this->assertEquals(2, $blueprint->tabs()->count());
 
         $return = $blueprint
-            // field "three" doesnt exist, so it will be added to a new "section_three" section
-            ->ensureField('three', ['type' => 'textarea'], 'section_three')
-            // field "two" exists, even though its in a different section than the one requested, so the config is merged
-            ->ensureField('two', ['type' => 'textarea'], 'section_three');
+            // field "three" doesnt exist, so it will be added to a new "tab_three" tab
+            ->ensureField('three', ['type' => 'textarea'], 'tab_three')
+            // field "two" exists, even though its in a different tab than the one requested, so the config is merged
+            ->ensureField('two', ['type' => 'textarea'], 'tab_three');
 
         $this->assertEquals($blueprint, $return);
         $this->assertTrue($blueprint->hasField('three'));
-        $this->assertEquals(3, $blueprint->sections()->count());
+        $this->assertEquals(3, $blueprint->tabs()->count());
         tap($blueprint->fields()->all(), function ($items) {
             $this->assertCount(3, $items);
             $this->assertEveryItemIsInstanceOf(Field::class, $items);
@@ -899,13 +899,13 @@ public function it_removes_a_field()
     {
         $blueprint = (new Blueprint)->setHandle('test')->setContents($contents = [
             'title' => 'Test',
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         ['handle' => 'one', 'field' => ['type' => 'text']],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         ['handle' => 'two', 'field' => ['type' => 'text']],
                         ['handle' => 'three', 'field' => ['type' => 'text']],
@@ -931,18 +931,18 @@ public function it_removes_a_field()
     }
 
     /** @test */
-    public function it_removes_a_field_from_a_specific_section()
+    public function it_removes_a_field_from_a_specific_tab()
     {
         $blueprint = (new Blueprint)->setHandle('test')->setContents($contents = [
             'title' => 'Test',
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         ['handle' => 'one', 'field' => ['type' => 'text']],
                         ['handle' => 'two', 'field' => ['type' => 'text']],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         ['handle' => 'three', 'field' => ['type' => 'text']],
                         ['handle' => 'four', 'field' => ['type' => 'text']],
@@ -957,12 +957,12 @@ public function it_removes_a_field_from_a_specific_section()
         $this->assertTrue($blueprint->hasField('four'));
 
         $return = $blueprint
-            ->removeField('one', 'section_one')
-            ->removeField('four', 'section_one') // Doesn't exist in section one, so it won't be removed.
-            ->removeFieldFromSection('three', 'section_two')
-            ->removeFieldFromSection('two', 'section_two') // Don't exist in section two, so it won't be removed.
-            ->removeField('seven', 'section_one') // Ensure it doesn't error when field doesn't exist at all.
-            ->removeFieldFromSection('eight', 'section_one'); // Ensure it doesn't error when field doesn't exist at all.
+            ->removeField('one', 'tab_one')
+            ->removeField('four', 'tab_one') // Doesn't exist in tab one, so it won't be removed.
+            ->removeFieldFromTab('three', 'tab_two')
+            ->removeFieldFromTab('two', 'tab_two') // Don't exist in tab two, so it won't be removed.
+            ->removeField('seven', 'tab_one') // Ensure it doesn't error when field doesn't exist at all.
+            ->removeFieldFromTab('eight', 'tab_one'); // Ensure it doesn't error when field doesn't exist at all.
 
         $this->assertEquals($blueprint, $return);
 
@@ -973,18 +973,18 @@ public function it_removes_a_field_from_a_specific_section()
     }
 
     /** @test */
-    public function it_removes_a_specific_section()
+    public function it_removes_a_specific_tab()
     {
         $blueprint = (new Blueprint)->setHandle('test')->setContents($contents = [
             'title' => 'Test',
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         ['handle' => 'one', 'field' => ['type' => 'text']],
                         ['handle' => 'two', 'field' => ['type' => 'text']],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         ['handle' => 'three', 'field' => ['type' => 'text']],
                         ['handle' => 'four', 'field' => ['type' => 'text']],
@@ -993,21 +993,21 @@ public function it_removes_a_specific_section()
             ],
         ]);
 
-        $this->assertTrue($blueprint->hasSection('section_one'));
+        $this->assertTrue($blueprint->hasTab('tab_one'));
         $this->assertTrue($blueprint->hasField('one'));
         $this->assertTrue($blueprint->hasField('two'));
-        $this->assertTrue($blueprint->hasSection('section_two'));
+        $this->assertTrue($blueprint->hasTab('tab_two'));
         $this->assertTrue($blueprint->hasField('three'));
         $this->assertTrue($blueprint->hasField('four'));
 
-        $return = $blueprint->removeSection('section_two');
+        $return = $blueprint->removeTab('tab_two');
 
         $this->assertEquals($blueprint, $return);
 
-        $this->assertTrue($blueprint->hasSection('section_one'));
+        $this->assertTrue($blueprint->hasTab('tab_one'));
         $this->assertTrue($blueprint->hasField('one'));
         $this->assertTrue($blueprint->hasField('two'));
-        $this->assertFalse($blueprint->hasSection('section_two'));
+        $this->assertFalse($blueprint->hasTab('tab_two'));
         $this->assertFalse($blueprint->hasField('three'));
         $this->assertFalse($blueprint->hasField('four'));
     }
@@ -1017,13 +1017,13 @@ public function it_validates_unique_handles()
     {
         $blueprint = (new Blueprint)->setHandle('test')->setContents($contents = [
             'title' => 'Test',
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         ['handle' => 'one', 'field' => ['type' => 'text']],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         ['handle' => 'one', 'field' => ['type' => 'text']],
                     ],
@@ -1052,13 +1052,13 @@ public function it_validates_unique_handles_between_blueprint_and_imported_field
 
         $blueprint = (new Blueprint)->setHandle('test')->setContents($contents = [
             'title' => 'Test',
-            'sections' => [
-                'section_one' => [
+            'tabs' => [
+                'tab_one' => [
                     'fields' => [
                         ['import' => 'test'],
                     ],
                 ],
-                'section_two' => [
+                'tab_two' => [
                     'fields' => [
                         ['handle' => 'one', 'field' => ['type' => 'text']],
                     ],
@@ -1088,8 +1088,8 @@ public function it_can_import_the_same_fieldset_twice_with_different_prefixes()
         $blueprint = (new Blueprint)->setHandle('test')
             ->setContents($contents = [
                 'title' => 'Test',
-                'sections' => [
-                    'section_one' => [
+                'tabs' => [
+                    'tab_one' => [
                         'fields' => [
                             ['import' => 'test', 'prefix' => 'first_'],
                             ['import' => 'test', 'prefix' => 'second_'],
diff --git a/tests/Fields/SectionTest.php b/tests/Fields/SectionTest.php
index 4ab4aac0ef6..63acdb924be 100644
--- a/tests/Fields/SectionTest.php
+++ b/tests/Fields/SectionTest.php
@@ -5,15 +5,15 @@
 use Facades\Statamic\Fields\FieldRepository;
 use Statamic\Fields\Field;
 use Statamic\Fields\Fields;
-use Statamic\Fields\Section;
+use Statamic\Fields\Tab;
 use Tests\TestCase;
 
-class SectionTest extends TestCase
+class TabTest extends TestCase
 {
     /** @test */
     public function it_gets_the_handle()
     {
-        $section = new Section('test');
+        $section = new Tab('test');
 
         $this->assertEquals('test', $section->handle());
     }
@@ -21,7 +21,7 @@ public function it_gets_the_handle()
     /** @test */
     public function it_gets_contents()
     {
-        $section = new Section('test');
+        $section = new Tab('test');
         $this->assertEquals([], $section->contents());
 
         $contents = [
@@ -37,7 +37,7 @@ public function it_gets_contents()
     /** @test */
     public function it_gets_the_display_text()
     {
-        $section = (new Section('test'))->setContents([
+        $section = (new Tab('test'))->setContents([
             'display' => 'The Display Text',
         ]);
 
@@ -47,7 +47,7 @@ public function it_gets_the_display_text()
     /** @test */
     public function the_display_text_falls_back_to_a_humanized_handle()
     {
-        $section = new Section('the_section_handle');
+        $section = new Tab('the_section_handle');
 
         $this->assertEquals('The section handle', $section->display());
     }
@@ -55,7 +55,7 @@ public function the_display_text_falls_back_to_a_humanized_handle()
     /** @test */
     public function it_gets_fields()
     {
-        $section = new Section('test');
+        $section = new Tab('test');
         tap($section->fields(), function ($fields) {
             $this->assertInstanceOf(Fields::class, $fields);
             $this->assertCount(0, $fields->all());
@@ -112,8 +112,8 @@ public function converts_to_array_suitable_for_rendering_fields_in_publish_compo
                 'validate' => 'min:2',
             ]));
 
-        $section = (new Section('test'))->setContents([
-            'display' => 'Test Section',
+        $section = (new Tab('test'))->setContents([
+            'display' => 'Test Tab',
             'instructions' => 'Does stuff',
             'fields' => [
                 [
@@ -128,7 +128,7 @@ public function converts_to_array_suitable_for_rendering_fields_in_publish_compo
         ]);
 
         $this->assertEquals([
-            'display' => 'Test Section',
+            'display' => 'Test Tab',
             'handle' => 'test',
             'instructions' => 'Does stuff',
             'fields' => [
diff --git a/tests/Preferences/PreferencesTest.php b/tests/Preferences/PreferencesTest.php
index 3e3a6ce422c..ebba4514aa4 100644
--- a/tests/Preferences/PreferencesTest.php
+++ b/tests/Preferences/PreferencesTest.php
@@ -25,7 +25,7 @@ public function setUp(): void
     public function it_registers_with_string_and_field_definition()
     {
         $preferences = new Preferences;
-        $this->assertEquals([], $preferences->sections()->all());
+        $this->assertEquals([], $preferences->tabs()->all());
 
         $preferences->register('foo', ['type' => 'text']);
 
@@ -36,14 +36,14 @@ public function it_registers_with_string_and_field_definition()
                     'foo' => ['type' => 'text'],
                 ],
             ],
-        ], $preferences->sections()->all());
+        ], $preferences->tabs()->all());
     }
 
     /** @test */
     public function it_registers_by_returning_array_from_extend_closure()
     {
         $preferences = new Preferences;
-        $this->assertEquals([], $preferences->sections()->all());
+        $this->assertEquals([], $preferences->tabs()->all());
 
         $preferences->extend(function () {
             return [
@@ -72,7 +72,7 @@ public function it_registers_by_returning_array_from_extend_closure()
             ];
         });
 
-        $this->assertEquals([], $preferences->sections()->all());
+        $this->assertEquals([], $preferences->tabs()->all());
 
         $preferences->boot();
 
@@ -90,7 +90,7 @@ public function it_registers_by_returning_array_from_extend_closure()
                     'baz' => ['type' => 'text'],
                 ],
             ],
-        ], $preferences->sections()->all());
+        ], $preferences->tabs()->all());
     }
 
     /** @test */
@@ -125,7 +125,7 @@ public function it_places_any_preferences_registered_early_without_extend_callba
 
         $preferences->boot();
 
-        $fields = collect($preferences->sections()->get('general')['fields'])->keys()->all();
+        $fields = collect($preferences->tabs()->get('general')['fields'])->keys()->all();
 
         $this->assertEquals(['three', 'one', 'two'], $fields);
     }
diff --git a/tests/__fixtures__/blueprints/article.yaml b/tests/__fixtures__/blueprints/article.yaml
index ee5be760db4..aa959c57dcb 100644
--- a/tests/__fixtures__/blueprints/article.yaml
+++ b/tests/__fixtures__/blueprints/article.yaml
@@ -1,5 +1,5 @@
 title: Article
-sections:
+tabs:
   main:
     display: Main
     fields:
diff --git a/tests/__fixtures__/content/1996-11-18-dance.md b/tests/__fixtures__/content/1996-11-18-dance.md
index b0c8433f18f..6cfb211fe37 100644
--- a/tests/__fixtures__/content/1996-11-18-dance.md
+++ b/tests/__fixtures__/content/1996-11-18-dance.md
@@ -395,7 +395,7 @@ replicator:
     video: 'https://www.youtube.com/watch?v=dQw4w9WgXcQ'
     yaml:
       title: 'Global Settings'
-      sections:
+      tabs:
         main:
           display: Main
           fields: