diff --git a/App/UI/GreenCertificate/ModalDetail/GreenCertificateTestDetail/GreenCertificateTestDetailView.swift b/App/UI/GreenCertificate/ModalDetail/GreenCertificateTestDetail/GreenCertificateTestDetailView.swift
index 14ecb818..35a47ec0 100644
--- a/App/UI/GreenCertificate/ModalDetail/GreenCertificateTestDetail/GreenCertificateTestDetailView.swift
+++ b/App/UI/GreenCertificate/ModalDetail/GreenCertificateTestDetail/GreenCertificateTestDetailView.swift
@@ -20,8 +20,8 @@ struct GreenCertificateTestDetailVM: ViewModelWithLocalState {
   let greenCertificate: GreenCertificate
 }
 
-struct configurationState {
-  static var _state = ["": ["": ""]]
+struct ConfigurationState {
+  static var state = ["": ["": ""]]
 }
 
 extension GreenCertificateTestDetailVM {
@@ -30,7 +30,7 @@ extension GreenCertificateTestDetailVM {
       return nil
     }
     self.greenCertificate = localState.greenCertificate
-    configurationState._state = state.configuration.eudccExpiration
+    ConfigurationState.state = state.configuration.eudccExpiration
   }
 }
 
@@ -661,8 +661,8 @@ public enum TestType: String {
 
   func gedValidUntilValue() -> String {
     let lan = Locale.current.languageCode ?? "en"
-    let validUntilValueMolecularTest:String? = configurationState._state[lan]?["molecular_test"]
-    let validUntilValueQuickTest:String? = configurationState._state[lan]?["rapid_test"]
+    let validUntilValueMolecularTest:String? = ConfigurationState.state[lan]?["molecular_test"]
+    let validUntilValueQuickTest:String? = ConfigurationState.state[lan]?["rapid_test"]
 
     switch self {
     case .molecularTest:
diff --git a/App/UI/GreenCertificate/ModalDetail/GreenCertificateVaccineDetail/GreenCertificateVaccineDetailView.swift b/App/UI/GreenCertificate/ModalDetail/GreenCertificateVaccineDetail/GreenCertificateVaccineDetailView.swift
index 91b5478d..502ab4d5 100644
--- a/App/UI/GreenCertificate/ModalDetail/GreenCertificateVaccineDetail/GreenCertificateVaccineDetailView.swift
+++ b/App/UI/GreenCertificate/ModalDetail/GreenCertificateVaccineDetail/GreenCertificateVaccineDetailView.swift
@@ -20,8 +20,8 @@ struct GreenCertificateVaccineDetailVM: ViewModelWithLocalState {
   let greenCertificate: GreenCertificate
 }
 
-struct configurationStateVaccine {
-  static var _state = ["": ["": ""]]
+struct ConfigurationStateVaccine {
+  static var state = ["": ["": ""]]
 }
 
 extension GreenCertificateVaccineDetailVM {
@@ -31,7 +31,7 @@ extension GreenCertificateVaccineDetailVM {
     }
 
     self.greenCertificate = localState.greenCertificate
-    configurationStateVaccine._state = (state?.configuration.eudccExpiration)!
+    ConfigurationStateVaccine.state = (state?.configuration.eudccExpiration)!
   }
 }
 
@@ -232,8 +232,8 @@ class GreenCertificateVaccineDetailView: UIView, ViewControllerModellableView {
       return
     }
     let lan = Locale.current.languageCode ?? "en"
-    let validUntilCompleteVaccine = configurationStateVaccine._state[lan]!["vaccine_fully_completed"]
-    let validUntilnotCompleteVaccine = configurationStateVaccine._state[lan]!["vaccine_first_dose"]
+    let validUntilCompleteVaccine = ConfigurationStateVaccine.state[lan]!["vaccine_fully_completed"]
+    let validUntilnotCompleteVaccine = ConfigurationStateVaccine.state[lan]!["vaccine_first_dose"]
 
     if let detailVaccineCertificate = model.greenCertificate.detailVaccineCertificate {
       Self.Style.value(self.diseaseVaccine, text: detailVaccineCertificate.disease)