diff --git a/library/euicc/RSPDefinitions_Templates.ttcn b/library/euicc/RSPDefinitions_Templates.ttcn
index 41b228f..bae10fd 100644
--- a/library/euicc/RSPDefinitions_Templates.ttcn
+++ b/library/euicc/RSPDefinitions_Templates.ttcn
@@ -447,27 +447,31 @@
 }
 
 /* GSMA SGP.22, section 5.7.5 (ES10x) */
+template (present) PrepareDownloadResponseOk
+tr_prepareDownloadResponseOk := {
+	euiccSigned2 := {
+		transactionId := ?,
+		euiccOtpk := ?,
+		hashCc := *
+	},
+	euiccSignature2 := ?
+}
+template (value) PrepareDownloadResponseOk
+ts_prepareDownloadResponseOk := {
+	euiccSigned2 := {
+		transactionId := 'ABCDEF'O,
+		euiccOtpk := 'AABBCCDDEEFF'O,
+		hashCc := omit
+	},
+	euiccSignature2 := 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'O
+}
 template (present) PrepareDownloadResponse
 tr_prepareDownloadResponse := {
-	downloadResponseOk := {
-		euiccSigned2 := {
-			transactionId := ?,
-			euiccOtpk := ?,
-			hashCc := *
-		},
-		euiccSignature2 := ?
-	}
+	downloadResponseOk := tr_prepareDownloadResponseOk
 }
 template (value) PrepareDownloadResponse
 ts_prepareDownloadResponse := {
-	downloadResponseOk := {
-		euiccSigned2 := {
-			transactionId := 'ABCDEF'O,
-			euiccOtpk := 'AABBCCDDEEFF'O,
-			hashCc := omit
-		},
-		euiccSignature2 := 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'O
-	}
+	downloadResponseOk := ts_prepareDownloadResponseOk
 }
 
 /* GSMA SGP.22, section 5.7.7 (ES10x) */