diff --git a/internal/legacydb/legacydb.go b/internal/legacydb/legacydb.go
index 8594a9b..cf17f8b 100644
--- a/internal/legacydb/legacydb.go
+++ b/internal/legacydb/legacydb.go
@@ -322,9 +322,9 @@ func New(logger *logrus.Logger, config *config.Database, commands chan *protocol
 		respPersonalClientCertificate:            "person",
 		respPersonalCodeSigningCertificate:       "code",
 		respPersonalServerCertificate:            "server",
-		respOrganizationalClientCertificate:      "org_person",
-		respOrganizationalCodeSigningCertificate: "org_code",
-		respOrganizationalServerCertificate:      "org_server",
+		respOrganizationalClientCertificate:      "person",
+		respOrganizationalCodeSigningCertificate: "code",
+		respOrganizationalServerCertificate:      "server",
 	}
 
 	supportedHashAlgorithms := map[string]crypto.Hash{