diff --git a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
index 343d3bfb6..fa056b7f5 100644
--- a/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/CaptivePortal/CaptivePortal.xml
@@ -8,7 +8,7 @@
         <zones>
             <zone type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <zoneid type="AutoNumberField">
@@ -20,7 +20,7 @@
                 <interfaces type="InterfaceField">
                     <Required>Y</Required>
                     <Multiple>Y</Multiple>
-                    <default>lan</default>
+                    <Default>lan</Default>
                     <filters>
                         <enable>/^(?!0).*$/</enable>
                         <ipaddr>/^((?!dhcp).)*$/</ipaddr>
@@ -32,7 +32,7 @@
                     <Multiple>Y</Multiple>
                 </authservers>
                 <alwaysSendAccountingReqs type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </alwaysSendAccountingReqs>
                 <authEnforceGroup type="AuthGroupField">
@@ -40,21 +40,21 @@
                 </authEnforceGroup>
                 <idletimeout type="IntegerField">
                     <Required>Y</Required>
-                    <default>0</default>
+                    <Default>0</Default>
                     <MinimumValue>0</MinimumValue>
                     <MaximumValue>10080</MaximumValue>
                     <ValidationMessage>Idle timeout, in minutes, must be between 0 (no timeout) and 10080 (a week)</ValidationMessage>
                 </idletimeout>
                 <hardtimeout type="IntegerField">
                     <Required>Y</Required>
-                    <default>0</default>
+                    <Default>0</Default>
                     <MinimumValue>0</MinimumValue>
                     <MaximumValue>10080</MaximumValue>
                     <ValidationMessage>Hard timeout, in minutes, must be between 0 (no timeout) and 10080 (a week)</ValidationMessage>
                 </hardtimeout>
                 <concurrentlogins type="BooleanField">
                     <Required>Y</Required>
-                    <default>1</default>
+                    <Default>1</Default>
                 </concurrentlogins>
                 <certificate type="CertificateField">
                     <Required>N</Required>
@@ -77,15 +77,15 @@
                     <ValidationMessage>Please enter valid mac addresses</ValidationMessage>
                 </allowedMACAddresses>
                 <transparentHTTPProxy type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </transparentHTTPProxy>
                 <transparentHTTPSProxy type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </transparentHTTPSProxy>
                 <extendedPreAuthData type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </extendedPreAuthData>
                 <template type="ModelRelationField">
diff --git a/src/opnsense/mvc/app/models/OPNsense/Cron/Cron.xml b/src/opnsense/mvc/app/models/OPNsense/Cron/Cron.xml
index 5f238ac18..83efb18ad 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Cron/Cron.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Cron/Cron.xml
@@ -7,46 +7,46 @@
             <job type="ArrayField">
                 <origin type="TextField">
                     <Required>Y</Required>
-                    <default>cron</default>
+                    <Default>cron</Default>
                     <mask>/^([a-z,A-Z,1-9]){0,30}$/</mask>
                     <ValidationMessage>Origin should be regular text of max 30 characters.</ValidationMessage>
                 </origin>
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <minutes type="TextField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                     <mask>/^((?:\*|[1-5][0-9]|0[0-9]|[0-9])(,{1}|-{1}|\/{1}|$))+$/</mask>
                     <ValidationMessage>Value needs to be between 0 and 59; multiple values, ranges, steps and asterisk are supported (ex. 1,10,20,30 or 1-30).</ValidationMessage>
                 </minutes>
                 <hours type="TextField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                     <mask>/^((?:\*|([1][0-9]|[2][0-3])|0[0-9]|[0-9])(,{1}|-{1}|\/{1}|$))+$/</mask>
                     <ValidationMessage>Value needs to be between 0 and 23; multiple values, ranges, steps and asterisk are supported (ex. 1,2,8 or 0-8).</ValidationMessage>
                 </hours>
                 <days type="TextField">
-                    <default>*</default>
+                    <Default>*</Default>
                     <Required>Y</Required>
                     <mask>/^(((?:\*|[1-2][0-9]|0[1-9]|[1-9]|[3][0-1])(,{1}|-{1}|\/{1}|$))+|L)$/</mask>
                     <ValidationMessage>Value needs to be between 1 and 31; multiple values, ranges, L (last day of month), steps and asterisk are supported (ex. 1,2,8 or 1-28).</ValidationMessage>
                 </days>
                 <months type="TextField">
-                    <default>*</default>
+                    <Default>*</Default>
                     <Required>Y</Required>
                     <mask>/^(((?:\*|[1][0-2]|0[1-9]|[1-9]|JAN|FEB|MAR|APR|MAY|JUN|JUL|AUG|SEP|OCT|NOV|DEC)(,{1}|-{1}|\/{1}|$))+)$/</mask>
                     <ValidationMessage>Value needs to be between 1 and 12 or JAN to DEC, multiple values, ranges, steps and asterisk are supported (ex. JAN,2,10 or 3-8).</ValidationMessage>
                 </months>
                 <weekdays type="TextField">
-                    <default>*</default>
+                    <Default>*</Default>
                     <Required>Y</Required>
                     <mask>/^(((?:\*|[0-7])(,{1}|-{1}|\/{1}|$))+)$/</mask>
                     <ValidationMessage>Value needs to be between 0 and 7 (Sunday to Sunday), multiple values, ranges, steps and asterisk are supported (ex. 1,2,4 or 0-4).</ValidationMessage>
                 </weekdays>
                 <who type="TextField">
-                    <default>root</default>
+                    <Default>root</Default>
                     <Required>Y</Required>
                 </who>
                 <command type="ConfigdActionsField">
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplate.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplate.xml
index 1ab01d8f0..691ca6f16 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplate.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Lvtemplate.xml
@@ -11,7 +11,7 @@
                     <ValidationMessage>Should be a string between 1 and 255 characters.</ValidationMessage>
                 </name>
                 <or type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </or>
                 <filters type="CSVListField">
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml
index ae29901b2..f261753d7 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Netflow.xml
@@ -22,7 +22,7 @@
             </egress_only>
             <version type="OptionField">
                 <Required>Y</Required>
-                <default>v9</default>
+                <Default>v9</Default>
                 <OptionValues>
                     <v5>v5</v5>
                     <v9>v9</v9>
@@ -36,19 +36,19 @@
         </capture>
         <collect>
             <enable type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </enable>
         </collect>
         <activeTimeout type="IntegerField">
-            <default>1800</default>
+            <Default>1800</Default>
             <Required>Y</Required>
             <MinimumValue>1</MinimumValue>
             <MaximumValue>86400</MaximumValue>
             <ValidationMessage>Active timeout needs to be an integer value between 1 and 86400</ValidationMessage>
          </activeTimeout>
          <inactiveTimeout type="IntegerField">
-            <default>15</default>
+            <Default>15</Default>
             <Required>Y</Required>
             <MinimumValue>1</MinimumValue>
             <MaximumValue>86400</MaximumValue>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/PacketCapture.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/PacketCapture.xml
index 924010687..4459d6171 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/PacketCapture.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/PacketCapture.xml
@@ -17,7 +17,7 @@
                 <ValidationMessage>Description should be a string between 1 and 255 characters</ValidationMessage>
             </description>
             <promiscuous type="BooleanField">
-              <default>0</default>
+              <Default>0</Default>
               <Required>Y</Required>
             </promiscuous>
             <fam type="OptionField">
@@ -29,18 +29,18 @@
                 </OptionValues>
             </fam>
             <protocol_not type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </protocol_not>
             <protocol type="ProtocolField">
                 <Required>Y</Required>
-                <default>any</default>
+                <Default>any</Default>
             </protocol>
             <host type=".\HostField">
                 <Required>N</Required>
             </host>
             <port_not type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </port_not>
             <port type="IntegerField">
@@ -55,7 +55,7 @@
             </snaplen>
             <count type="IntegerField">
                 <Required>Y</Required>
-                <default>100</default>
+                <Default>100</Default>
                 <MinimumValue>0</MinimumValue>
             </count>
         </settings>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Ping.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Ping.xml
index 221e6c8e8..fcd86924f 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Ping.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Ping.xml
@@ -12,7 +12,7 @@
             </hostname>
             <fam type="OptionField">
                 <Required>Y</Required>
-                <default>ip</default>
+                <Default>ip</Default>
                 <OptionValues>
                     <ip>IPv4</ip>
                     <ip6>IPv6</ip6>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Portprobe.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Portprobe.xml
index db491b19b..8c73396ef 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Portprobe.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Portprobe.xml
@@ -15,7 +15,7 @@
             </port>
             <ipproto type="OptionField">
                 <Required>Y</Required>
-                <default>inet</default>
+                <Default>inet</Default>
                 <OptionValues>
                     <inet>IPv4</inet>
                     <inet6>IPv6</inet6>
@@ -30,7 +30,7 @@
                 <Required>N</Required>
             </source_port>
             <showtext type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </showtext>
         </settings>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Traceroute.xml b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Traceroute.xml
index 57329e8f6..746c0a109 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Traceroute.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Diagnostics/Traceroute.xml
@@ -12,7 +12,7 @@
             </hostname>
             <ipproto type="OptionField">
                 <Required>Y</Required>
-                <default>inet</default>
+                <Default>inet</Default>
                 <OptionValues>
                     <inet>IPv4</inet>
                     <inet6>IPv6</inet6>
@@ -20,7 +20,7 @@
             </ipproto>
             <protocol type="OptionField">
                 <Required>Y</Required>
-                <default>udp</default>
+                <Default>udp</Default>
                 <OptionValues>
                     <udp>UDP</udp>
                     <icmp>ICMP</icmp>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml b/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
index d3823b7cb..b6755d473 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
@@ -12,7 +12,7 @@
         <aliases>
             <alias type=".\AliasField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <name type=".\AliasNameField">
@@ -26,7 +26,7 @@
                 </name>
                 <type type="OptionField">
                     <Required>Y</Required>
-                    <default>alert</default>
+                    <Default>alert</Default>
                     <OptionValues>
                         <host>Host(s)</host>
                         <network>Network(s)</network>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Firewall/Group.xml b/src/opnsense/mvc/app/models/OPNsense/Firewall/Group.xml
index 7835d0ad8..a8f705c55 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Firewall/Group.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Firewall/Group.xml
@@ -22,7 +22,7 @@
                 <MaximumValue>9999</MaximumValue>
                 <ValidationMessage>provide a valid sequence for sorting</ValidationMessage>
                 <Required>Y</Required>
-                <default>0</default>
+                <Default>0</Default>
             </sequence>
             <descr type="TextField">
                 <mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){0,255}$/u</mask>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml b/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml
index 735124e59..977b9bc8d 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IDS/IDS.xml
@@ -10,12 +10,12 @@
                     <Required>Y</Required>
                 </sid>
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <action type="OptionField">
                     <Required>Y</Required>
-                    <default>alert</default>
+                    <Default>alert</Default>
                     <OptionValues>
                         <alert>Alert</alert>
                         <drop>Drop</drop>
@@ -26,13 +26,13 @@
         <policies>
             <policy type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <prio type="IntegerField">
                     <ValidationMessage>Priority should be a number.</ValidationMessage>
                     <Required>Y</Required>
-                    <default>0</default>
+                    <Default>0</Default>
                 </prio>
                 <action type="OptionField">
                     <Multiple>Y</Multiple>
@@ -64,7 +64,7 @@
                 </content>
                 <new_action type="OptionField">
                     <Required>Y</Required>
-                    <default>alert</default>
+                    <Default>alert</Default>
                     <OptionValues>
                         <default value="default">Default</default>
                         <alert>Alert</alert>
@@ -83,7 +83,7 @@
             <rule type="ArrayField">
                 <!--user defined rules -->
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <source type="NetworkField">
@@ -104,7 +104,7 @@
                 </description>
                 <action type="OptionField">
                     <Required>Y</Required>
-                    <default>alert</default>
+                    <Default>alert</Default>
                     <OptionValues>
                         <alert>Alert</alert>
                         <drop>Drop</drop>
@@ -112,7 +112,7 @@
                     </OptionValues>
                 </action>
                 <bypass type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </bypass>
             </rule>
@@ -124,7 +124,7 @@
                     <mask>/^([\t\n\v\f\r\- 0-9a-zA-Z.,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>
                 </filename>
                 <enabled type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </enabled>
             </file>
@@ -143,20 +143,20 @@
         </fileTags>
         <general>
             <enabled type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </enabled>
             <ips type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </ips>
             <promisc type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </promisc>
             <interfaces type="InterfaceField">
                 <Required>Y</Required>
-                <default>wan</default>
+                <Default>wan</Default>
                 <Multiple>Y</Multiple>
                 <AddParentDevices>Y</AddParentDevices>
                 <filters>
@@ -167,7 +167,7 @@
             <homenet type="NetworkField">
                 <Required>Y</Required>
                 <FieldSeparator>,</FieldSeparator>
-                <default>192.168.0.0/16,10.0.0.0/8,172.16.0.0/12</default>
+                <Default>192.168.0.0/16,10.0.0.0/8,172.16.0.0/12</Default>
                 <asList>Y</asList>
             </homenet>
             <defaultPacketSize type="IntegerField">
@@ -192,7 +192,7 @@
             </UpdateCron>
             <AlertLogrotate type="OptionField">
               <Required>Y</Required>
-              <default>W0D23</default>
+              <Default>W0D23</Default>
               <OptionValues>
                   <W0D23>Weekly</W0D23>
                   <D0>Daily</D0>
@@ -201,7 +201,7 @@
             </AlertLogrotate>
             <AlertSaveLogs type="IntegerField">
                 <Required>Y</Required>
-                <default>4</default>
+                <Default>4</Default>
                 <MinimumValue>1</MinimumValue>
                 <MaximumValue>1000</MaximumValue>
                 <ValidationMessage>Enter a valid number of logs to save</ValidationMessage>
@@ -243,15 +243,15 @@
               </toserver_groups>
             </detect>
             <syslog type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </syslog>
             <syslog_eve type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </syslog_eve>
             <LogPayload type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </LogPayload>
             <verbosity type="OptionField">
diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.xml b/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.xml
index 72617ee87..4949904c2 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/IPsec.xml
@@ -17,7 +17,7 @@
                 </name>
                 <keyType type="OptionField">
                     <Required>Y</Required>
-                    <default>rsa</default>
+                    <Default>rsa</Default>
                     <OptionValues>
                         <rsa>RSA</rsa>
                         <ecdsa>ECDSA</ecdsa>
@@ -59,7 +59,7 @@
                 </remote_ident>
                 <keyType type="OptionField">
                     <Required>Y</Required>
-                    <default>PSK</default>
+                    <Default>PSK</Default>
                     <OptionValues>
                         <PSK>PSK</PSK>
                         <EAP>EAP</EAP>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml b/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml
index c110d9100..8a2314de8 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml
@@ -6,17 +6,17 @@
         <Connections>
             <Connection type=".\ConnnectionField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <proposals type=".\IPsecProposalField">
-                    <default>default</default>
+                    <Default>default</Default>
                     <Required>Y</Required>
                     <Multiple>Y</Multiple>
                 </proposals>
                 <unique type="OptionField">
                     <Required>Y</Required>
-                    <default>no</default>
+                    <Default>no</Default>
                     <OptionValues>
                         <no>No (default)</no>
                         <never>Never</never>
@@ -25,12 +25,12 @@
                     </OptionValues>
                 </unique>
                 <aggressive type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </aggressive>
                 <version type="OptionField">
                     <Required>Y</Required>
-                    <default>0</default>
+                    <Default>0</Default>
                     <OptionValues>
                         <ike value="0">IKEv1+IKEv2</ike>
                         <ikev1 value="1">IKEv1</ikev1>
@@ -38,7 +38,7 @@
                     </OptionValues>
                 </version>
                 <mobike type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </mobike>
                 <local_addrs type=".\IKEAdressField">
@@ -48,7 +48,7 @@
                     <Required>N</Required>
                 </remote_addrs>
                 <encap type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </encap>
                 <reauth_time type="IntegerField">
@@ -81,7 +81,7 @@
                     <Multiple>Y</Multiple>
                 </pools>
                 <send_certreq type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </send_certreq>
                 <send_cert type="OptionField">
@@ -106,7 +106,7 @@
         <locals>
             <local type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <connection type="ModelRelationField">
@@ -123,11 +123,11 @@
                     <Required>Y</Required>
                     <MinimumValue>0</MinimumValue>
                     <MaximumValue>10</MaximumValue>
-                    <default>0</default>
+                    <Default>0</Default>
                 </round>
                 <auth type="OptionField">
                     <Required>Y</Required>
-                    <default>psk</default>
+                    <Default>psk</Default>
                     <OptionValues>
                         <psk>Pre-Shared Key</psk>
                         <pubkey>Public Key</pubkey>
@@ -169,7 +169,7 @@
         <remotes>
             <remote type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <connection type="ModelRelationField">
@@ -186,11 +186,11 @@
                     <Required>Y</Required>
                     <MinimumValue>0</MinimumValue>
                     <MaximumValue>10</MaximumValue>
-                    <default>0</default>
+                    <Default>0</Default>
                 </round>
                 <auth type="OptionField">
                     <Required>Y</Required>
-                    <default>psk</default>
+                    <Default>psk</Default>
                     <OptionValues>
                         <psk>Pre-Shared Key</psk>
                         <pubkey>Public Key</pubkey>
@@ -233,7 +233,7 @@
         <children>
             <child type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <connection type="ModelRelationField">
@@ -252,17 +252,17 @@
                     <Required>N</Required>
                 </reqid>
                 <esp_proposals type=".\IPsecProposalField">
-                    <default>default</default>
+                    <Default>default</Default>
                     <Required>Y</Required>
                     <Multiple>Y</Multiple>
                 </esp_proposals>
                 <sha256_96 type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </sha256_96>
                 <start_action type="OptionField">
                     <Required>Y</Required>
-                    <default>start</default>
+                    <Default>start</Default>
                     <OptionValues>
                         <none>None</none>
                         <trap_start value='trap|start'>Trap+start</trap_start>
@@ -273,7 +273,7 @@
                 </start_action>
                 <close_action type="OptionField">
                     <Required>Y</Required>
-                    <default>none</default>
+                    <Default>none</Default>
                     <OptionValues>
                         <none>None</none>
                         <trap>Trap</trap>
@@ -282,7 +282,7 @@
                 </close_action>
                 <dpd_action  type="OptionField">
                     <Required>Y</Required>
-                    <default>clear</default>
+                    <Default>clear</Default>
                     <OptionValues>
                         <clear>Clear</clear>
                         <trap>Trap</trap>
@@ -291,7 +291,7 @@
                 </dpd_action>
                 <mode type="OptionField">
                     <Required>Y</Required>
-                    <default>tunnel</default>
+                    <Default>tunnel</Default>
                     <OptionValues>
                         <tunnel>Tunnel</tunnel>
                         <transport>Transport</transport>
@@ -300,7 +300,7 @@
                     </OptionValues>
                 </mode>
                 <policies type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </policies>
                 <local_ts type="NetworkField">
@@ -314,7 +314,7 @@
                     <WildcardEnabled>N</WildcardEnabled>
                 </remote_ts>
                 <rekey_time type="IntegerField">
-                    <default>3600</default>
+                    <Default>3600</Default>
                     <MinimumValue>0</MinimumValue>
                     <MaximumValue>500000</MaximumValue>
                     <Required>Y</Required>
@@ -327,7 +327,7 @@
         <Pools>
             <Pool type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <name type="TextField">
@@ -351,7 +351,7 @@
         <VTIs>
             <VTI type=".\VTIField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <reqid type="IntegerField">
@@ -397,12 +397,12 @@
         <SPDs>
             <SPD type=".\SPDField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <protocol type="OptionField">
                     <Required>Y</Required>
-                    <default>esp</default>
+                    <Default>esp</Default>
                     <OptionValues>
                         <esp>ESP</esp>
                         <ah>AH</ah>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Lagg.xml b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Lagg.xml
index 1e5685749..98c62fce8 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Lagg.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Lagg.xml
@@ -21,7 +21,7 @@
             </members>
             <proto type="OptionField">
               <Required>Y</Required>
-              <default>lacp</default>
+              <Default>lacp</Default>
               <OptionValues>
                   <none>None</none>
                   <lacp>lacp</lacp>
@@ -32,7 +32,7 @@
               </OptionValues>
             </proto>
             <lacp_fast_timeout type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </lacp_fast_timeout>
             <use_flowid type="OptionField">
diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.xml b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.xml
index 6601ae603..4d8e2faf0 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vip.xml
@@ -12,7 +12,7 @@
             </interface>
             <mode type="OptionField">
               <Required>Y</Required>
-              <default>ipalias</default>
+              <Default>ipalias</Default>
               <OptionValues>
                   <ipalias>IP Alias</ipalias>
                   <carp>CARP</carp>
@@ -39,11 +39,11 @@
                 <Required>N</Required>
             </gateway>
             <noexpand type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </noexpand>
             <nobind type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </nobind>
             <password type="TextField">
@@ -57,14 +57,14 @@
             </vhid>
             <advbase type="IntegerField">
                 <Required>Y</Required>
-                <default>1</default>
+                <Default>1</Default>
                 <MinimumValue>1</MinimumValue>
                 <MaximumValue>254</MaximumValue>
                 <ValidationMessage>Invalid advertisement interval, acceptable values are 1 to 255.</ValidationMessage>
             </advbase>
             <advskew type="IntegerField">
                 <Required>Y</Required>
-                <default>0</default>
+                <Default>0</Default>
                 <MinimumValue>0</MinimumValue>
                 <MaximumValue>254</MaximumValue>
                 <ValidationMessage>Invalid skew value, acceptable values are 0 to 255.</ValidationMessage>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.xml b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.xml
index f4716a13c..3c1a23e2c 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Interfaces/Vlan.xml
@@ -30,7 +30,7 @@
             </tag>
             <pcp type="OptionField">
                 <Required>Y</Required>
-                <default>0</default>
+                <Default>0</Default>
                 <OptionValues>
                     <pcp1 value="1">Background (1, lowest)</pcp1>
                     <pcp0 value="0">Best Effort (0, default)</pcp0>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml b/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
index 8ddb64600..32bb7d09e 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.xml
@@ -5,25 +5,25 @@
    <items>
       <general>
          <enabled type="BooleanField">
-            <default>0</default>
+            <Default>0</Default>
             <Required>Y</Required>
          </enabled>
          <interval type="IntegerField">
-            <default>120</default>
+            <Default>120</Default>
             <Required>Y</Required>
             <MinimumValue>0</MinimumValue>
             <MaximumValue>86400</MaximumValue>
             <ValidationMessage>Polling Interval needs to be an integer value between 0 and 86400</ValidationMessage>
          </interval>
          <startdelay type="IntegerField">
-            <default>120</default>
+            <Default>120</Default>
             <Required>Y</Required>
             <MinimumValue>0</MinimumValue>
             <MaximumValue>86400</MaximumValue>
             <ValidationMessage>Start Delay needs to be an integer value between 0 and 86400</ValidationMessage>
          </startdelay>
          <mailserver type="CSVListField">
-            <default>127.0.0.1</default>
+            <Default>127.0.0.1</Default>
             <Required>Y</Required>
             <Multiple>Y</Multiple>
             <mask>/^([0-9a-zA-Z\.,_\-:]){0,1024}$/u</mask>
@@ -32,7 +32,7 @@
          </mailserver>
          <port type="IntegerField">
             <Required>Y</Required>
-            <default>25</default>
+            <Default>25</Default>
             <MinimumValue>0</MinimumValue>
             <MaximumValue>65535</MaximumValue>
             <ValidationMessage>Port needs to be an integer value between 0 and 65535</ValidationMessage>
@@ -44,11 +44,11 @@
             <Required>N</Required>
          </password>
          <ssl type="BooleanField">
-            <default>0</default>
+            <Default>0</Default>
             <Required>Y</Required>
          </ssl>
          <sslversion type="OptionField">
-            <default>auto</default>
+            <Default>auto</Default>
             <Required>Y</Required>
             <OptionValues>
                <auto>AUTO</auto>
@@ -60,7 +60,7 @@
          </sslversion>
          <sslverify type="BooleanField">
             <Required>Y</Required>
-            <default>1</default>
+            <Default>1</Default>
          </sslverify>
          <logfile type="TextField">
             <Required>N</Required>
@@ -82,13 +82,13 @@
             <ValidationMessage>Eventqueue Slots must be a numeric value.</ValidationMessage>
          </eventqueueSlots>
          <httpdEnabled type="BooleanField">
-            <default>0</default>
+            <Default>0</Default>
             <Required>Y</Required>
          </httpdEnabled>
          <httpdUsername type="TextField"/>
          <httpdPassword type="TextField"/>
          <httpdPort type="IntegerField">
-            <default>2812</default>
+            <Default>2812</Default>
             <Required>Y</Required>
             <MinimumValue>1</MinimumValue>
             <MaximumValue>65535</MaximumValue>
@@ -102,30 +102,30 @@
             <Required>N</Required>
          </mmonitUrl>
          <mmonitTimeout type="IntegerField">
-            <default>5</default>
+            <Default>5</Default>
             <Required>Y</Required>
             <MinimumValue>0</MinimumValue>
             <MaximumValue>86400</MaximumValue>
             <ValidationMessage>M/Monit Timeout needs to be an integer value between 0 and 86400</ValidationMessage>
          </mmonitTimeout>
          <mmonitRegisterCredentials type="BooleanField">
-            <default>1</default>
+            <Default>1</Default>
             <Required>Y</Required>
          </mmonitRegisterCredentials>
       </general>
       <alert type="ArrayField">
          <enabled type="BooleanField">
-            <default>0</default>
+            <Default>0</Default>
             <Required>Y</Required>
          </enabled>
          <recipient type="EmailField">
-            <default>root@localhost.local</default>
+            <Default>root@localhost.local</Default>
             <Required>Y</Required>
             <ValidationMessage>Please enter a valid email address.</ValidationMessage>
          </recipient>
          <noton type="BooleanField">
             <Required>Y</Required>
-            <default>0</default>
+            <Default>0</Default>
          </noton>
          <events type="CSVListField">
             <Required>N</Required>
@@ -178,7 +178,7 @@
       </alert>
       <service type="ArrayField">
          <enabled type="BooleanField">
-            <default>0</default>
+            <Default>0</Default>
             <Required>Y</Required>
          </enabled>
          <name type="TextField">
@@ -223,14 +223,14 @@
             <ValidationMessage>Should be a valid absolute file or folder path.</ValidationMessage>
          </path>
          <timeout type="IntegerField">
-            <default>300</default>
+            <Default>300</Default>
             <Required>Y</Required>
             <MinimumValue>1</MinimumValue>
             <MaximumValue>86400</MaximumValue>
             <ValidationMessage>Program Timeout needs to be an integer value between 1 and 86400</ValidationMessage>>
          </timeout>
          <starttimeout type="IntegerField">
-            <default>30</default>
+            <Default>30</Default>
             <Required>Y</Required>
             <MinimumValue>0</MinimumValue>
             <MaximumValue>86400</MaximumValue>
@@ -296,7 +296,7 @@
          </name>
          <type type="OptionField">
             <Required>Y</Required>
-            <default>Custom</default>
+            <Default>Custom</Default>
             <OptionValues>
                <Existence>Existence</Existence>
                <SystemResource>System Resource</SystemResource>
diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/Export.xml b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/Export.xml
index 7d78d7ec1..a77ff19af 100644
--- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/Export.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/Export.xml
@@ -21,11 +21,11 @@
                     <ValidationMessage>Port needs to be an integer value between 1 and 65535</ValidationMessage>
                 </local_port>
                 <random_local_port type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </random_local_port>
                 <validate_server_cn type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </validate_server_cn>
                 <cryptoapi type="BooleanField"/>
diff --git a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
index 3c14e955a..6c2428e57 100644
--- a/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/OpenVPN/OpenVPN.xml
@@ -6,7 +6,7 @@
         <Overwrites>
             <Overwrite type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <servers type=".\OpenVPNServerField">
@@ -17,11 +17,11 @@
                     <Required>Y</Required>
                 </common_name>
                 <block type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </block>
                 <push_reset type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </push_reset>
                 <tunnel_network type="NetworkField">
@@ -59,7 +59,7 @@
                     </OptionValues>
                 </redirect_gateway>
                 <register_dns type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </register_dns>
                 <dns_domain type="HostnameField">
@@ -99,12 +99,12 @@
                     <Required>Y</Required>
                 </vpnid>
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <dev_type type="OptionField">
                     <Required>Y</Required>
-                    <default>tun</default>
+                    <Default>tun</Default>
                     <OptionValues>
                         <tun>tun</tun>
                         <tap>tap</tap>
@@ -112,7 +112,7 @@
                 </dev_type>
                 <verb type="OptionField">
                     <Required>Y</Required>
-                    <default>3</default>
+                    <Default>3</Default>
                     <OptionValues>
                         <o0 value="0">0 (No output except fatal errors.)</o0>
                         <o1 value="1">1 (Normal)</o1>
@@ -130,7 +130,7 @@
                 </verb>
                 <proto type="OptionField">
                     <Required>Y</Required>
-                    <default>udp</default>
+                    <Default>udp</Default>
                     <OptionValues>
                         <udp>UDP</udp>
                         <udp4>UDP (IPv4)</udp4>
@@ -149,7 +149,7 @@
                 </local>
                 <topology type="OptionField">
                     <Required>Y</Required>
-                    <default>subnet</default>
+                    <Default>subnet</Default>
                     <OptionValues>
                         <net30>net30</net30>
                         <p2p>p2p</p2p>
@@ -159,7 +159,7 @@
                 <remote type=".\RemoteHostField">
                 </remote>
                 <role type="OptionField">
-                    <default>server</default>
+                    <Default>server</Default>
                     <Required>Y</Required>
                     <OptionValues>
                         <client>Client</client>
@@ -214,7 +214,7 @@
                 </cert_depth>
                 <verify_client_cert type="OptionField">
                     <Required>Y</Required>
-                    <default>require</default>
+                    <Default>require</Default>
                     <OptionValues>
                         <none>none</none>
                         <require>required</require>
@@ -295,11 +295,11 @@
                     </OptionValues>
                 </various_flags>
                 <username_as_common_name type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </username_as_common_name>
                 <strictusercn type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </strictusercn>
                 <username type="TextField"/>
@@ -339,7 +339,7 @@
                     </OptionValues>
                 </redirect_gateway>
                 <register_dns type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </register_dns>
                 <dns_domain type="HostnameField">
@@ -389,7 +389,7 @@
             <StaticKey type="ArrayField">
                 <mode type="OptionField">
                     <Required>Y</Required>
-                    <default>crypt</default>
+                    <Default>crypt</Default>
                     <OptionValues>
                         <auth>auth (Authenticate control channel packets)</auth>
                         <crypt>crypt (Encrypt and authenticate all control channel packets)</crypt>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
index 0ec8c55e5..e0e9606f3 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Proxy/Proxy.xml
@@ -5,7 +5,7 @@
     <items>
         <general>
             <enabled type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </enabled>
             <error_pages type="OptionField">
@@ -25,11 +25,11 @@
             <logging>
                 <enable>
                     <accessLog type="BooleanField">
-                        <default>1</default>
+                        <Default>1</Default>
                         <Required>Y</Required>
                     </accessLog>
                     <storeLog type="BooleanField">
-                        <default>1</default>
+                        <Default>1</Default>
                         <Required>Y</Required>
                     </storeLog>
                 </enable>
@@ -75,7 +75,7 @@
                 </OptionValues>
             </uriWhitespaceHandling>
             <enablePinger type="BooleanField">
-                <default>1</default>
+                <Default>1</Default>
                 <Required>Y</Required>
             </enablePinger>
             <useViaHeader type="BooleanField"/>
@@ -97,15 +97,15 @@
             <cache>
                 <local>
                     <enabled type="BooleanField">
-                        <default>0</default>
+                        <Default>0</Default>
                         <Required>Y</Required>
                     </enabled>
                     <directory type="TextField">
-                        <default>/var/squid/cache</default>
+                        <Default>/var/squid/cache</Default>
                         <Required>Y</Required>
                     </directory>
                     <cache_mem type="IntegerField">
-                        <default>256</default>
+                        <Default>256</Default>
                         <MinimumValue>0</MinimumValue>
                         <ValidationMessage>Specify a positive memory cache size. (number of MB's)</ValidationMessage>
                         <Required>Y</Required>
@@ -132,36 +132,36 @@
                         </OptionValues>
                     </memory_cache_mode>
                     <size type="IntegerField">
-                        <default>100</default>
+                        <Default>100</Default>
                         <MinimumValue>1</MinimumValue>
                         <ValidationMessage>Specify a positive cache size. (number of MB's)</ValidationMessage>
                         <Required>Y</Required>
                     </size>
                     <l1 type="IntegerField">
-                        <default>16</default>
+                        <Default>16</Default>
                         <MinimumValue>1</MinimumValue>
                         <ValidationMessage>Specify a positive number of first-level subdirectories.</ValidationMessage>
                         <Required>Y</Required>
                     </l1>
                     <l2 type="IntegerField">
-                        <default>256</default>
+                        <Default>256</Default>
                         <MinimumValue>1</MinimumValue>
                         <ValidationMessage>Specify a positive number of second-level subdirectories.</ValidationMessage>
                         <Required>Y</Required>
                     </l2>
                     <cache_linux_packages type="BooleanField">
-                        <default>0</default>
+                        <Default>0</Default>
                         <Required>Y</Required>
                     </cache_linux_packages>
                     <cache_windows_updates type="BooleanField">
-                        <default>0</default>
+                        <Default>0</Default>
                         <Required>Y</Required>
                     </cache_windows_updates>
                 </local>
             </cache>
             <traffic>
                 <enabled type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </enabled>
                 <maxDownloadSize type="IntegerField">
@@ -201,7 +201,7 @@
             </traffic>
             <parentproxy>
                 <enabled type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </enabled>
                 <host type="HostnameField">
@@ -217,17 +217,17 @@
                     </Constraints>
                 </host>
                 <enableauth type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </enableauth>
                 <user type="TextField">
-                    <default>username</default>
+                    <Default>username</Default>
                     <Required>Y</Required>
                     <mask>/^([0-9a-zA-Z\._\-%@]){1,128}$/u</mask>
                     <ValidationMessage>Username can be up to 128 signs long. Alphanumeric characters and also dot, dash, percent sign (for URL escapes), at sign and underscore allowed.</ValidationMessage>
                 </user>
                 <password type="TextField">
-                    <default>password</default>
+                    <Default>password</Default>
                     <Required>Y</Required>
                     <mask>/^([0-9a-zA-Z\._\-%]){1,128}$/u</mask>
                     <ValidationMessage>Password can be up to 128 signs long. Alphanumeric characters and also dot, dash, percent sign (for URL escapes) and underscore allowed.</ValidationMessage>
@@ -263,21 +263,21 @@
                 </filters>
             </interfaces>
             <port type="IntegerField">
-                <default>3128</default>
+                <Default>3128</Default>
                 <MinimumValue>1</MinimumValue>
                 <MaximumValue>65535</MaximumValue>
                 <ValidationMessage>Proxy port needs to be an integer value between 1 and 65535</ValidationMessage>
                 <Required>Y</Required>
             </port>
             <sslbumpport type="IntegerField">
-                <default>3129</default>
+                <Default>3129</Default>
                 <MinimumValue>1</MinimumValue>
                 <MaximumValue>65535</MaximumValue>
                 <ValidationMessage>SSL Proxy port needs to be an integer value between 1 and 65535</ValidationMessage>
                 <Required>Y</Required>
             </sslbumpport>
             <sslbump type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
                 <Constraints>
                     <check001>
@@ -290,7 +290,7 @@
                 </Constraints>
             </sslbump>
             <sslurlonly type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
                 <Constraints>
                     <check001>
@@ -310,20 +310,20 @@
             </sslnobumpsites>
             <ssl_crtd_storage_max_size type="IntegerField">
               <Required>Y</Required>
-              <default>4</default>
+              <Default>4</Default>
               <MinimumValue>1</MinimumValue>
               <MaximumValue>65535</MaximumValue>
               <ValidationMessage>max size needs to be an integer value between 1 and 65535</ValidationMessage>
             </ssl_crtd_storage_max_size>
             <sslcrtd_children type="IntegerField">
               <Required>Y</Required>
-              <default>5</default>
+              <Default>5</Default>
               <MinimumValue>1</MinimumValue>
               <MaximumValue>32</MaximumValue>
               <ValidationMessage>the number of sslrtd children needs to be an integer value between 1 and 32</ValidationMessage>
             </sslcrtd_children>
             <snmp_enable type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </snmp_enable>
             <snmp_port type="IntegerField">
@@ -331,10 +331,10 @@
                 <MaximumValue>65535</MaximumValue>
                 <ValidationMessage>SNMP port needs to be an integer value between 1 and 65535</ValidationMessage>
                 <Required>Y</Required>
-                <default>3401</default>
+                <Default>3401</Default>
             </snmp_port>
             <snmp_password type="TextField">
-                <default>public</default>
+                <Default>public</Default>
                 <Required>Y</Required>
             </snmp_password>
             <ftpInterfaces type="InterfaceField">
@@ -346,22 +346,22 @@
                 </filters>
             </ftpInterfaces>
             <ftpPort type="IntegerField">
-                <default>2121</default>
+                <Default>2121</Default>
                 <MinimumValue>1</MinimumValue>
                 <MaximumValue>65535</MaximumValue>
                 <ValidationMessage>FTP Proxy port needs to be an integer value between 1 and 65535</ValidationMessage>
                 <Required>Y</Required>
             </ftpPort>
             <ftpTransparentMode type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </ftpTransparentMode>
             <addACLforInterfaceSubnets type="BooleanField">
-                <default>1</default>
+                <Default>1</Default>
                 <Required>Y</Required>
             </addACLforInterfaceSubnets>
             <transparentMode type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </transparentMode>
             <acl>
@@ -413,7 +413,7 @@
                     <blacklists>
                         <blacklist type="ArrayField">
                             <enabled type="BooleanField">
-                                <default>1</default>
+                                <Default>1</Default>
                                 <Required>Y</Required>
                             </enabled>
                             <filename type="TextField">
@@ -447,7 +447,7 @@
                                 <Multiple>Y</Multiple>
                             </filter>
                             <sslNoVerify type="BooleanField">
-                                <default>0</default>
+                                <Default>0</Default>
                                 <Required>Y</Required>
                             </sslNoVerify>
                             <description type="TextField">
@@ -474,38 +474,38 @@
             </acl>
             <icap>
                 <enable type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </enable>
                 <RequestURL type="TextField"/>
                 <ResponseURL type="TextField"/>
                 <SendClientIP type="BooleanField">
                     <Required>Y</Required>
-                    <default>1</default>
+                    <Default>1</Default>
                 </SendClientIP>
                 <SendUsername type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </SendUsername>
                 <EncodeUsername type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </EncodeUsername>
                 <UsernameHeader type="TextField">
                     <Required>Y</Required>
-                    <default>X-Username</default>
+                    <Default>X-Username</Default>
                     <mask>/^([a-zA-Z-]+)$/</mask>
                 </UsernameHeader>
                 <EnablePreview type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </EnablePreview>
                 <PreviewSize type="IntegerField">
-                    <default>1024</default>
+                    <Default>1024</Default>
                     <Required>Y</Required>
                 </PreviewSize>
                 <OptionsTTL type="IntegerField">
-                    <default>60</default>
+                    <Default>60</Default>
                     <Required>Y</Required>
                 </OptionsTTL>
                 <exclude type="CSVListField">
@@ -586,7 +586,7 @@
                   <mask>/^([\t\n\v\f\r 0-9a-zA-Z\-.,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>
               </description>
               <negate type="BooleanField">
-                  <default>0</default>
+                  <Default>0</Default>
                   <Required>Y</Required>
               </negate>
               <match_type type="OptionField">
@@ -697,7 +697,7 @@
           </match>
           <rule type="ArrayField">
               <enabled type="BooleanField">
-                  <default>1</default>
+                  <Default>1</Default>
                   <Required>Y</Required>
               </enabled>
               <description type="TextField">
diff --git a/src/opnsense/mvc/app/models/OPNsense/Routes/Route.xml b/src/opnsense/mvc/app/models/OPNsense/Routes/Route.xml
index 981583ac1..10e8bcacb 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Routes/Route.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Routes/Route.xml
@@ -19,7 +19,7 @@
             <Required>N</Required>
           </descr>
           <disabled type="BooleanField">
-            <default>0</default>
+            <Default>0</Default>
             <Required>Y</Required>
           </disabled>
         </route>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml b/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml
index 922659ba5..5bc382059 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Syslog/Syslog.xml
@@ -4,19 +4,19 @@
     <items>
         <general>
             <enabled type="BooleanField">
-              <default>1</default>
+              <Default>1</Default>
               <Required>Y</Required>
             </enabled>
         </general>
         <destinations>
             <destination type="ArrayField">
                 <enabled type="BooleanField">
-                  <default>1</default>
+                  <Default>1</Default>
                   <Required>Y</Required>
                 </enabled>
                 <transport type="OptionField">
                   <Required>Y</Required>
-                  <default>udp</default>
+                  <Default>udp</Default>
                   <OptionValues>
                       <udp4>UDP(4)</udp4>
                       <tcp4>TCP(4)</tcp4>
@@ -87,10 +87,10 @@
                 </certificate>
                 <port type="PortField">
                     <Required>Y</Required>
-                    <default>514</default>
+                    <Default>514</Default>
                 </port>
                 <rfc5424 type="BooleanField">
-                  <default>0</default>
+                  <Default>0</Default>
                   <Required>Y</Required>
                 </rfc5424>
                 <description type="TextField">
diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
index 180a1a705..09f08c0c5 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.xml
@@ -12,7 +12,7 @@
                     <Required>Y</Required>
                 </number>
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <bandwidth type="IntegerField">
@@ -22,7 +22,7 @@
                 </bandwidth>
                 <bandwidthMetric type="OptionField">
                     <Required>Y</Required>
-                    <default>Kbit</default>
+                    <Default>Kbit</Default>
                     <OptionValues>
                         <bit>bit/s</bit>
                         <Kbit>kbit/s</Kbit>
@@ -39,7 +39,7 @@
                 </queue>
                 <mask type="OptionField">
                     <Required>Y</Required>
-                    <default>none</default>
+                    <Default>none</Default>
                     <OptionValues>
                         <none>(none)</none>
                         <src-ip>source</src-ip>
@@ -64,7 +64,7 @@
                     </OptionValues>
                 </scheduler>
                 <codel_enable type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                     <Constraints>
                         <check001>
@@ -87,11 +87,11 @@
                     <MaximumValue>10000</MaximumValue>
                 </codel_interval>
                 <codel_ecn_enable type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </codel_ecn_enable>
                 <pie_enable type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                     <Constraints>
                         <check001>
@@ -141,7 +141,7 @@
                     <Required>Y</Required>
                 </number>
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <pipe type="ModelRelationField">
@@ -158,13 +158,13 @@
                 <weight type="IntegerField">
                     <MinimumValue>1</MinimumValue>
                     <MaximumValue>100</MaximumValue>
-                    <default>100</default>
+                    <Default>100</Default>
                     <Required>Y</Required>
                     <ValidationMessage>Weight must be between 1...100</ValidationMessage>
                 </weight>
                 <mask type="OptionField">
                     <Required>Y</Required>
-                    <default>none</default>
+                    <Default>none</Default>
                     <OptionValues>
                         <none>(none)</none>
                         <src-ip>source</src-ip>
@@ -178,7 +178,7 @@
                     <ValidationMessage>bucket size should be between 1...65535</ValidationMessage>
                 </buckets>
                 <codel_enable type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                     <Constraints>
                         <check001>
@@ -201,11 +201,11 @@
                     <MaximumValue>10000</MaximumValue>
                 </codel_interval>
                 <codel_ecn_enable type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </codel_ecn_enable>
                 <pie_enable type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                     <Constraints>
                         <check001>
@@ -228,7 +228,7 @@
         <rules>
             <rule type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <sequence type="IntegerField">
@@ -236,11 +236,11 @@
                     <MaximumValue>1000000</MaximumValue>
                     <ValidationMessage>provide a valid sequence for sorting</ValidationMessage>
                     <Required>Y</Required>
-                    <default>1</default>
+                    <Default>1</Default>
                 </sequence>
                 <interface type="InterfaceField">
                     <Required>Y</Required>
-                    <default>wan</default>
+                    <Default>wan</Default>
                     <AllowDynamic>Y</AllowDynamic>
                     <filters>
                         <enable>/^(?!0).*$/</enable>
@@ -255,7 +255,7 @@
                 </interface2>
                 <proto type="OptionField">
                     <Required>Y</Required>
-                    <default>ip</default>
+                    <Default>ip</Default>
                     <OptionValues>
                         <ip>ip</ip>
                         <ip4>ipv4</ip4>
@@ -281,34 +281,34 @@
                 <source type="NetworkField">
                     <Required>Y</Required>
                     <FieldSeparator>,</FieldSeparator>
-                    <default>any</default>
+                    <Default>any</Default>
                     <asList>Y</asList>
                 </source>
                 <source_not type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </source_not>
                 <src_port type="PortField">
                     <Required>Y</Required>
                     <EnableWellKnown>Y</EnableWellKnown>
                     <EnableRanges>Y</EnableRanges>
-                    <default>any</default>
+                    <Default>any</Default>
                 </src_port>
                 <destination type="NetworkField">
                     <Required>Y</Required>
                     <FieldSeparator>,</FieldSeparator>
-                    <default>any</default>
+                    <Default>any</Default>
                     <asList>Y</asList>
                 </destination>
                 <destination_not type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </destination_not>
                 <dst_port type="PortField">
                     <Required>Y</Required>
                     <EnableWellKnown>Y</EnableWellKnown>
                     <EnableRanges>Y</EnableRanges>
-                    <default>any</default>
+                    <Default>any</Default>
                 </dst_port>
                 <dscp type="OptionField">
                     <Required>N</Required>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml b/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
index a7d6e8603..3d4e4ef5b 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Unbound/Unbound.xml
@@ -5,11 +5,11 @@
     <items>
         <general>
             <enabled type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </enabled>
             <port type="PortField">
-                <default>53</default>
+                <Default>53</Default>
                 <Required>Y</Required>
             </port>
             <stats type="BooleanField"/>
@@ -37,7 +37,7 @@
             <txtsupport type="BooleanField"/>
             <cacheflush type="BooleanField"/>
             <local_zone_type type="OptionField">
-                <default>transparent</default>
+                <Default>transparent</Default>
                 <Required>Y</Required>
                 <OptionValues>
                     <opt1 value="transparent">transparent</opt1>
@@ -78,7 +78,7 @@
             <logservfail type="BooleanField"/>
             <loglocalactions type="BooleanField"/>
             <logverbosity type="OptionField">
-                <default>1</default>
+                <Default>1</Default>
                 <Required>Y</Required>
                 <OptionValues>
                     <opt1 value="0">Level 0</opt1>
@@ -90,7 +90,7 @@
                 </OptionValues>
             </logverbosity>
             <valloglevel  type="OptionField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
                 <OptionValues>
                     <opt1 value="0">Level 0 (Default)</opt1>
@@ -105,7 +105,7 @@
                 <Required>Y</Required>
                 <FieldSeparator>,</FieldSeparator>
                 <WildcardEnabled>N</WildcardEnabled>
-                <default>0.0.0.0/8,10.0.0.0/8,100.64.0.0/10,169.254.0.0/16,172.16.0.0/12,192.0.2.0/24,192.168.0.0/16,198.18.0.0/15,198.51.100.0/24,203.0.113.0/24,233.252.0.0/24,::1/128,2001:db8::/32,fc00::/8,fd00::/8,fe80::/10</default>
+                <Default>0.0.0.0/8,10.0.0.0/8,100.64.0.0/10,169.254.0.0/16,172.16.0.0/12,192.0.2.0/24,192.168.0.0/16,198.18.0.0/15,198.51.100.0/24,203.0.113.0/24,233.252.0.0/24,::1/128,2001:db8::/32,fc00::/8,fd00::/8,fe80::/10</Default>
                 <asList>Y</asList>
             </privateaddress>
             <insecuredomain type="CSVListField"/>
@@ -132,7 +132,7 @@
         </advanced>
         <acls>
             <default_action type="OptionField">
-                <default>allow</default>
+                <Default>allow</Default>
                 <Required>Y</Required>
                 <OptionValues>
                     <opt1 value="allow">Allow</opt1>
@@ -142,7 +142,7 @@
             </default_action>
             <acl type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <name type="TextField">
@@ -150,7 +150,7 @@
                     <ValidationMessage>An Access list name is required</ValidationMessage>
                 </name>
                 <action type="OptionField">
-                    <default>allow</default>
+                    <Default>allow</Default>
                     <Required>Y</Required>
                     <OptionValues>
                         <opt1 value="allow">Allow</opt1>
@@ -179,7 +179,7 @@
         </acls>
         <dnsbl>
             <enabled type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
             </enabled>
             <safesearch type="BooleanField"/>
@@ -251,11 +251,11 @@
             <dot type="ArrayField">
                 <enabled type="BooleanField">
                     <Required>Y</Required>
-                    <default>1</default>
+                    <Default>1</Default>
                 </enabled>
                 <type type="OptionField">
                     <Required>Y</Required>
-                    <default>dot</default>
+                    <Default>dot</Default>
                     <OptionValues>
                         <dot>DNS over TLS</dot>
                         <forward>Forward</forward>
@@ -280,7 +280,7 @@
         <hosts>
             <host type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <hostname type="HostnameField">
@@ -294,7 +294,7 @@
                 </domain>
                 <rr type="OptionField">
                     <Required>Y</Required>
-                    <default>A</default>
+                    <Default>A</Default>
                     <OptionValues>
                         <A>A (IPv4 address)</A>
                         <AAAA>AAAA (IPv6 address)</AAAA>
@@ -361,7 +361,7 @@
         <aliases>
             <alias type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <host type="ModelRelationField">
@@ -408,7 +408,7 @@
         <domains>
             <domain type="ArrayField">
                 <enabled type="BooleanField">
-                    <default>1</default>
+                    <Default>1</Default>
                     <Required>Y</Required>
                 </enabled>
                 <domain type=".\UnboundDomainField">
@@ -420,7 +420,7 @@
                     <ValidationMessage>A valid IP must be specified.</ValidationMessage>
                 </server>
                 <forward_tcp_upstream type="BooleanField">
-                    <default>0</default>
+                    <Default>0</Default>
                     <Required>Y</Required>
                 </forward_tcp_upstream>
                 <description type="TextField">
diff --git a/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/TestModel.xml b/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/TestModel.xml
index 728921846..ca8673a88 100644
--- a/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/TestModel.xml
+++ b/src/opnsense/mvc/tests/app/models/OPNsense/Base/BaseModel/TestModel.xml
@@ -9,7 +9,7 @@
         <general>
             <!-- fields -->
             <FromEmail type="EmailField">
-                <default>sample@example.com</default>
+                <Default>sample@example.com</Default>
                 <Required>Y</Required>
             </FromEmail>
         </general>
@@ -92,7 +92,7 @@
         </SingleSelect>
         <DependConstraint>
             <value1 type="BooleanField">
-                <default>0</default>
+                <Default>0</Default>
                 <Required>Y</Required>
                 <Constraints>
                     <check001>