diff --git a/src/xcode/ENA/ENA/Source/HTTPClient/Resources/OTPAuthorizationForELS/OTPAuthorizationForELSResource.swift b/src/xcode/ENA/ENA/Source/HTTPClient/Resources/OTPAuthorizationForELS/OTPAuthorizationForELSResource.swift
index 86756436b13..d3a57919ee1 100644
--- a/src/xcode/ENA/ENA/Source/HTTPClient/Resources/OTPAuthorizationForELS/OTPAuthorizationForELSResource.swift
+++ b/src/xcode/ENA/ENA/Source/HTTPClient/Resources/OTPAuthorizationForELS/OTPAuthorizationForELSResource.swift
@@ -29,29 +29,29 @@ enum OTPAuthorizationError: LocalizedError, Equatable {
 				return "generalError"
 			}
 		case .invalidResponseError:
-			return "invalidResponseError"
+			return "INVALID_RESPONSE_ERROR"
 		case .internalServerError:
-			return "internalServerError"
+			return "INTERNAL_SERVER_ERROR"
 		case .otpAlreadyUsedThisMonth:
-			return "otpAlreadyUsedThisMonth"
+			return "OTP_ALREADY_USED_THIS_MONTH"
 		case .otherServerError:
-			return "otherServerError"
+			return "OTHER_SERVER_ERROR"
 		case .apiTokenAlreadyIssued:
-			return "apiTokenAlreadyIssued"
+			return "API_TOKEN_ALEARY_ISSUED"
 		case .apiTokenExpired:
-			return "apiTokenExpired"
+			return "API_TOKEN_EXPIRED"
 		case .apiTokenQuotaExceeded:
-			return "apiTokenQuotaExceeded"
+			return "API_TOKEN_QUOTA_EXEEDED"
 		case .deviceBlocked:
-			return "deviceBlocked"
+			return "DEVICE_BLOCKED"
 		case .deviceTokenInvalid:
-			return "deviceTokenInvalid"
+			return "DEVICE_TOKEN_INVALID"
 		case .deviceTokenRedeemed:
-			return "deviceTokenRedeemed"
+			return "DEVICE_TOKEN_REDEEMED"
 		case .deviceTokenSyntaxError:
-			return "deviceTokenSyntaxError"
+			return "DEVICE_TOKEN_SYNTAX_ERROR"
 		case .noNetworkConnection:
-			return "noNetworkConnection"
+			return "NO_NETWORK_CONNECTION"
 		}
 	}
 
diff --git a/src/xcode/ENA/ENA/Source/Services/OTP/Model/OTPError.swift b/src/xcode/ENA/ENA/Source/Services/OTP/Model/OTPError.swift
index 5b933bc9fa5..176a06adf89 100644
--- a/src/xcode/ENA/ENA/Source/Services/OTP/Model/OTPError.swift
+++ b/src/xcode/ENA/ENA/Source/Services/OTP/Model/OTPError.swift
@@ -25,36 +25,36 @@ enum OTPError: Error, Equatable, LocalizedError {
 		switch self {
 		case .generalError(let error):
 			if let e = error?.localizedDescription {
-				return "generalError with underlying: \(e)"
+				return "GENERAL_ERROR with underlying: \(e)"
 			} else {
-				return "generalError"
+				return "GENERAL_ERROR"
 			}
 		case .invalidResponseError:
-			return "invalidResponseError"
+			return "INVALID_RESPONSE_ERROR"
 		case .internalServerError:
-			return "internalServerError"
+			return "INTERNAL_SERVER_ERROR"
 		case .otpAlreadyUsedThisMonth:
-			return "otpAlreadyUsedThisMonth"
+			return "OTP_ALREADY_USED_THIS_MONTH"
 		case .otherServerError:
-			return "otherServerError"
+			return "OTHER_SERVER_ERROR"
 		case .apiTokenAlreadyIssued:
-			return "apiTokenAlreadyIssued"
+			return "API_TOKEN_ALEARY_ISSUED"
 		case .apiTokenExpired:
-			return "apiTokenExpired"
+			return "API_TOKEN_EXPIRED"
 		case .apiTokenQuotaExceeded:
-			return "apiTokenQuotaExceeded"
+			return "API_TOKEN_QUOTA_EXEEDED"
 		case .deviceBlocked:
-			return "deviceBlocked"
+			return "DEVICE_BLOCKED"
 		case .deviceTokenInvalid:
-			return "deviceTokenInvalid"
+			return "DEVICE_TOKEN_INVALID"
 		case .deviceTokenRedeemed:
-			return "deviceTokenRedeemed"
+			return "DEVICE_TOKEN_REDEEMED"
 		case .deviceTokenSyntaxError:
-			return "deviceTokenSyntaxError"
+			return "DEVICE_TOKEN_SYNTAX_ERROR"
 		case .noNetworkConnection:
-			return "noNetworkConnection"
+			return "NO_NETWORK_CONNECTION"
 		case .restServiceError:
-			return "restServiceError"
+			return "REST_SERVICE_ERROR"
 		}
     }
 	
diff --git a/src/xcode/ENA/ENA/Source/Services/PPAccessControl/Model/SRSError.swift b/src/xcode/ENA/ENA/Source/Services/PPAccessControl/Model/SRSError.swift
index d0099f6b077..4f36973578b 100644
--- a/src/xcode/ENA/ENA/Source/Services/PPAccessControl/Model/SRSError.swift
+++ b/src/xcode/ENA/ENA/Source/Services/PPAccessControl/Model/SRSError.swift
@@ -25,9 +25,9 @@ extension SRSError: ErrorCodeProviding {
 	var description: String {
 		switch self {
 		case .ppacError(let ppacError):
-			return "ppacError: \(ppacError.description)"
+			return ppacError.description
 		case .otpError(let otpError):
-			return "otpError: \(otpError.description)"
+			return otpError.description
 		case .srsOTPClientError:
 			return "SRS_OTP_CLIENT_ERROR"
 		case .srsOTPNetworkError: