diff --git a/src/components/App/__snapshots__/App.test.js.snap b/src/components/App/__snapshots__/App.test.js.snap
index 91e332d..026f0d7 100644
--- a/src/components/App/__snapshots__/App.test.js.snap
+++ b/src/components/App/__snapshots__/App.test.js.snap
@@ -5644,7 +5644,7 @@ exports[`App Route /tools/certificates/add authenticated 1`] = `
                         class="PrivateSwitchBase-input-1436"
                         name="cert-type"
                         type="radio"
-                        value="TREX"
+                        value="TBOX"
                       />
                       <div
                         class="PrivateRadioButtonIcon-root-1437 PrivateRadioButtonIcon-checked-1439"
@@ -5678,7 +5678,7 @@ exports[`App Route /tools/certificates/add authenticated 1`] = `
                   <span
                     class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
                   >
-                    TREX
+                    TBOX
                   </span>
                 </label>
                 <label
@@ -5695,7 +5695,7 @@ exports[`App Route /tools/certificates/add authenticated 1`] = `
                         class="PrivateSwitchBase-input-1436"
                         name="cert-type"
                         type="radio"
-                        value="HMI"
+                        value="ICC"
                       />
                       <div
                         class="PrivateRadioButtonIcon-root-1437"
@@ -5729,7 +5729,7 @@ exports[`App Route /tools/certificates/add authenticated 1`] = `
                   <span
                     class="MuiTypography-root MuiFormControlLabel-label MuiTypography-body1"
                   >
-                    HMI
+                    ICC
                   </span>
                 </label>
                 <label
@@ -5746,7 +5746,7 @@ exports[`App Route /tools/certificates/add authenticated 1`] = `
                         class="PrivateSwitchBase-input-1436"
                         name="cert-type"
                         type="radio"
-                        value="CHARGE"
+                        value="Charging"
                       />
                       <div
                         class="PrivateRadioButtonIcon-root-1437"
diff --git a/src/components/Certificates/Add/CreateForm.jsx b/src/components/Certificates/Add/CreateForm.jsx
index 4a67e96..86de585 100644
--- a/src/components/Certificates/Add/CreateForm.jsx
+++ b/src/components/Certificates/Add/CreateForm.jsx
@@ -14,7 +14,7 @@ import { CertTypes } from "../../Contexts/CertificateContext";
 const CreateForm = ({ onCreate, busy }) => {
   const classes = useStyles();
   const vinEl = useRef(null);
-  const [certType, setCertType] = useState(CertTypes.TREX);
+  const [certType, setCertType] = useState(CertTypes.TBOX);
 
   const onSubmit = async (event) => {
     event.preventDefault();
@@ -56,14 +56,14 @@ const CreateForm = ({ onCreate, busy }) => {
           margin="normal"
         >
           <FormControlLabel
-            value={CertTypes.TREX}
+            value={CertTypes.TBOX}
             control={<Radio />}
-            label="TREX"
+            label="TBOX"
           />
           <FormControlLabel
-            value={CertTypes.HMI}
+            value={CertTypes.ICC}
             control={<Radio />}
-            label="HMI"
+            label="ICC"
           />
           <FormControlLabel
             value={CertTypes.Charging}
diff --git a/src/components/Contexts/CertificateContext.jsx b/src/components/Contexts/CertificateContext.jsx
index 6f27396..6b4b634 100644
--- a/src/components/Contexts/CertificateContext.jsx
+++ b/src/components/Contexts/CertificateContext.jsx
@@ -5,9 +5,9 @@ import api from "../../services/certificatesAPI";
 const CertificateContext = React.createContext();
 
 export const CertTypes = {
-  TREX: "TREX",
-  HMI: "HMI",
-  Charging: "CHARGE",
+  TBOX: "TBOX",
+  ICC: "ICC",
+  Charging: "Charging",
 };
 
 const validateCreate = (data) => {