diff --git a/src/Handler/StorageKey.hs b/src/Handler/StorageKey.hs
index 4589364eb..2bb5cf233 100644
--- a/src/Handler/StorageKey.hs
+++ b/src/Handler/StorageKey.hs
@@ -13,9 +13,13 @@ import qualified Crypto.KDF.HKDF as HKDF
 
 
 data StorageKeyType
-  = SKTExamCorrect ExamId
+  = SKTExamCorrect
+    { _sktExam :: CryptoUUIDExam
+    }
 deriveJSON defaultOptions
-  { constructorTagModifier = camelToPathPiece' 3
+  { fieldLabelModifier     = camelToPathPiece' 1
+  , constructorTagModifier = camelToPathPiece' 1
+  , tagSingleConstructors  = True
   } ''StorageKeyType
 
 data StorageKeyRequest
@@ -27,6 +31,7 @@ data StorageKeyRequest
     }
 deriveJSON defaultOptions
   { fieldLabelModifier = camelToPathPiece' 2
+  , omitNothingFields  = True
   } ''StorageKeyRequest
 
 data StorageKeyResponse