diff --git a/system/blueprints/config/site.yaml b/system/blueprints/config/site.yaml
index 149dcdf4b..485f2c375 100644
--- a/system/blueprints/config/site.yaml
+++ b/system/blueprints/config/site.yaml
@@ -3,7 +3,7 @@ form:
     validation: loose
     fields:
 
-        section_content:
+        content:
             type: section
             title: PLUGIN_ADMIN.DEFAULTS
             underline: true
@@ -39,7 +39,7 @@ form:
                     validate:
                         type: commalist
 
-        section_summary:
+        summary:
             type: section
             title: PLUGIN_ADMIN.PAGE_SUMMARY
             underline: true
@@ -82,7 +82,7 @@ form:
                     label: PLUGIN_ADMIN.DELIMITER
                     help: PLUGIN_ADMIN.DELIMITER_HELP
 
-        section_metadata:
+        metadata:
             type: section
             title: PLUGIN_ADMIN.METADATA
             underline: true
@@ -95,7 +95,7 @@ form:
                    placeholder_key: PLUGIN_ADMIN.METADATA_KEY
                    placeholder_value: PLUGIN_ADMIN.METADATA_VALUE
 
-        section_routes:
+        routes:
             type: section
             title: PLUGIN_ADMIN.REDIRECTS_AND_ROUTES
             underline: true
diff --git a/system/blueprints/pages/default.yaml b/system/blueprints/pages/default.yaml
index a4fcda7b6..1b9b166ee 100644
--- a/system/blueprints/pages/default.yaml
+++ b/system/blueprints/pages/default.yaml
@@ -16,7 +16,7 @@ form:
       active: 1
 
       fields:
-        tab_content:
+        content:
           type: tab
           title: PLUGIN_ADMIN.CONTENT
 
@@ -37,7 +37,7 @@ form:
               type: pagemedia
               label: PLUGIN_ADMIN.PAGE_MEDIA
 
-        tab_options:
+        options:
           type: tab
           title: PLUGIN_ADMIN.OPTIONS
 
@@ -101,7 +101,7 @@ form:
                   validate:
                     type: array
 
-        tab_advanced:
+        advanced:
           type: tab
           title: PLUGIN_ADMIN.ADVANCED
 
diff --git a/system/blueprints/pages/modular.yaml b/system/blueprints/pages/modular.yaml
index 32492e056..ce62ecd1c 100644
--- a/system/blueprints/pages/modular.yaml
+++ b/system/blueprints/pages/modular.yaml
@@ -10,7 +10,7 @@ form:
       active: 1
 
       fields:
-        tab_content:
+        content:
           fields:
 
             header.content.items:
diff --git a/system/blueprints/pages/modular_raw.yaml b/system/blueprints/pages/modular_raw.yaml
index f6fd2d8ea..393cde5fd 100644
--- a/system/blueprints/pages/modular_raw.yaml
+++ b/system/blueprints/pages/modular_raw.yaml
@@ -13,7 +13,7 @@ form:
       active: 1
 
       fields:
-        tab_content:
+        content:
           type: tab
           title: PLUGIN_ADMIN.CONTENT
 
@@ -32,7 +32,7 @@ form:
               label: PLUGIN_ADMIN.PAGE_MEDIA
 
 
-        tab_options:
+        options:
           type: tab
           title: PLUGIN_ADMIN.OPTIONS
 
diff --git a/system/blueprints/pages/raw.yaml b/system/blueprints/pages/raw.yaml
index a0a5a710f..bed82d593 100644
--- a/system/blueprints/pages/raw.yaml
+++ b/system/blueprints/pages/raw.yaml
@@ -13,7 +13,7 @@ form:
       active: 1
 
       fields:
-        tab_content:
+        content:
           type: tab
           title: PLUGIN_ADMIN.CONTENT
 
@@ -31,7 +31,7 @@ form:
               type: pagemedia
               label: PLUGIN_ADMIN.PAGE_MEDIA
 
-        tab_options:
+        options:
           type: tab
           title: PLUGIN_ADMIN.OPTIONS