diff --git a/src/opnsense/mvc/app/models/OPNsense/Trust/Cert.xml b/src/opnsense/mvc/app/models/OPNsense/Trust/Cert.xml
index db1634bb5..a05c0c618 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Trust/Cert.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Trust/Cert.xml
@@ -14,8 +14,8 @@
             <csr type="TextField"/>
             <prv type="TextField"/>
             <action type="OptionField" volatile="true">
-                <default>internal</default>
-                <required>Y</required>
+                <Default>internal</Default>
+                <Required>Y</Required>
                 <OptionValues>
                     <internal>Create an internal Certificate</internal>
                     <external>Create a Certificate Signing Request</external>
@@ -25,8 +25,8 @@
                 </OptionValues>
             </action>
             <key type="OptionField" volatile="true">
-                <required>Y</required>
-                <default>2048</default>
+                <Required>Y</Required>
+                <Default>2048</Default>
                 <OptionValues>
                     <RSA-512 value='512'>RSA-512</RSA-512>
                     <RSA-1024 value='1024'>RSA-1024</RSA-1024>
@@ -40,8 +40,8 @@
                 </OptionValues>
             </key>
             <digest type="OptionField" volatile="true">
-                <required>Y</required>
-                <default>sha256</default>
+                <Required>Y</Required>
+                <Default>sha256</Default>
                 <OptionValues>
                     <sha1>SHA1</sha1>
                     <sha224>SHA224</sha224>
@@ -51,8 +51,8 @@
                 </OptionValues>
             </digest>
             <cert_type type="OptionField" volatile="true">
-                <required>Y</required>
-                <default>usr_cert</default>
+                <Required>Y</Required>
+                <Default>usr_cert</Default>
                 <OptionValues>
                     <usr_cert>Client Certificate</usr_cert>
                     <server_cert>Server Certificate</server_cert>
@@ -61,8 +61,8 @@
                 </OptionValues>
             </cert_type>
             <private_key_location type="OptionField" volatile="true">
-                <required>Y</required>
-                <default>usr_cert</default>
+                <Required>Y</Required>
+                <Default>usr_cert</Default>
                 <OptionValues>
                     <firewall>Save on this firewall</firewall>
                     <local>Download and do not save</local>
@@ -83,7 +83,7 @@
             <country type="CountryField" volatile="true">
                 <Mask>/^[^\x00-\x08\x0b\x0c\x0e-\x1f\n]*$/</Mask>
                 <Default>NL</Default>
-                <required>Y</required>
+                <Required>Y</Required>
             </country>
             <email type="EmailField"/>
             <commonname type="TextField" volatile="true">