diff --git a/src/main/java/de/mlessmann/certassist/models/CertificateType.java b/src/main/java/de/mlessmann/certassist/models/CertificateType.java
index 6353710..5c6ea66 100644
--- a/src/main/java/de/mlessmann/certassist/models/CertificateType.java
+++ b/src/main/java/de/mlessmann/certassist/models/CertificateType.java
@@ -1,7 +1,8 @@
 package de.mlessmann.certassist.models;
 
 public enum CertificateType {
-    ROOT_AUTHORITY,
-    STANDALONE_CERTIFICATE,
-    NORMAL_CERTIFICATE,
+    ROOT_CA,
+    STANDALONE_CERT,
+    SIGNED_CERT,
+    CLIENT_CERT
 }
diff --git a/src/test/java/de/mlessmann/certassist/repositories/CertificateRepositoryTest.java b/src/test/java/de/mlessmann/certassist/repositories/CertificateRepositoryTest.java
index e7008fc..f107461 100644
--- a/src/test/java/de/mlessmann/certassist/repositories/CertificateRepositoryTest.java
+++ b/src/test/java/de/mlessmann/certassist/repositories/CertificateRepositoryTest.java
@@ -23,7 +23,7 @@ class CertificateRepositoryTest {
     private Certificate getCertificate() {
         final Certificate certificate = new Certificate();
         certificate.setCommonName("test-cn");
-        certificate.setType(CertificateType.NORMAL_CERTIFICATE);
+        certificate.setType(CertificateType.SIGNED_CERT);
         certificate.setRequestedKeyLength(1);
         certificate.setRequestedValidityDays(1);
 
@@ -38,7 +38,7 @@ class CertificateRepositoryTest {
 
         Certificate foundCertificate = repository.findById(certificate.getId()).orElseThrow();
         assertThat(foundCertificate.getCommonName()).isEqualTo("test-cn");
-        assertThat(foundCertificate.getType()).isEqualTo(CertificateType.NORMAL_CERTIFICATE);
+        assertThat(foundCertificate.getType()).isEqualTo(CertificateType.SIGNED_CERT);
     }
 
     @Test