diff --git a/src/main/java/com/prowidesoftware/swift/model/MtSwiftMessage.java b/src/main/java/com/prowidesoftware/swift/model/MtSwiftMessage.java
index 9f00ad246..8dddc1df9 100644
--- a/src/main/java/com/prowidesoftware/swift/model/MtSwiftMessage.java
+++ b/src/main/java/com/prowidesoftware/swift/model/MtSwiftMessage.java
@@ -367,7 +367,7 @@ public void updateFromFIN(final String fin, final MessageMetadataStrategy metada
     @Deprecated
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     public void updateFromFIN() {
-        DeprecationUtils.phase2(getClass(), "updateFromFIN()", "Use updateFromFIN(String) instead");
+        DeprecationUtils.phase3(getClass(), "updateFromFIN()", "Use updateFromFIN(String) instead");
         updateFromMessage();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/CurrencyResolver.java b/src/main/java/com/prowidesoftware/swift/model/field/CurrencyResolver.java
index d4a450804..85827ce8d 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/CurrencyResolver.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/CurrencyResolver.java
@@ -51,7 +51,7 @@ public static List<String> currencyStrings(final Field f) {
     @Deprecated
     @ProwideDeprecated(phase4= TargetYear.SRU2024)
     public static List<String> resolveComponentsPattern(String pattern, List<String> components) {
-        DeprecationUtils.phase2(CurrencyResolver.class, "resolveComponentsPattern", "Use currencyStrings instead");
+        DeprecationUtils.phase3(CurrencyResolver.class, "resolveComponentsPattern", "Use currencyStrings instead");
         return ResolverUtils.findWantedType(pattern, 'C', components);
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionAPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionAPartyField.java
index 4c9be7a9a..4a74a0f2e 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionAPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionAPartyField.java
@@ -183,7 +183,7 @@ public String getValue() {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
@@ -391,7 +391,7 @@ public com.prowidesoftware.swift.model.BIC getIdentifierCodeAsBIC() {
     @Deprecated
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     public String getBIC() {
-        DeprecationUtils.phase2(getClass(), "getBIC()", "Use getIdentifierCode() instead.");
+        DeprecationUtils.phase3(getClass(), "getBIC()", "Use getIdentifierCode() instead.");
         return getIdentifierCode();
     }
 
@@ -401,7 +401,7 @@ public String getBIC() {
     @Deprecated
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     public com.prowidesoftware.swift.model.BIC getBICAsBIC() {
-        DeprecationUtils.phase2(getClass(), "getBICAsBIC()", "Use getIdentifierCodeAsBIC() instead.");
+        DeprecationUtils.phase3(getClass(), "getBICAsBIC()", "Use getIdentifierCodeAsBIC() instead.");
         return getIdentifierCodeAsBIC();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionBPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionBPartyField.java
index 5db234b8a..658ea0142 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionBPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionBPartyField.java
@@ -166,7 +166,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionCPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionCPartyField.java
index 113ff13de..9934b1194 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionCPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionCPartyField.java
@@ -126,7 +126,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionDPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionDPartyField.java
index 8c4a48fb5..882f35028 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionDPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionDPartyField.java
@@ -162,7 +162,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionGPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionGPartyField.java
index 3501bd783..cb538aa8f 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionGPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionGPartyField.java
@@ -150,7 +150,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
@@ -330,7 +330,7 @@ public String getIdentifierCode() {
     @Deprecated
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     public String getBIC() {
-        DeprecationUtils.phase2(getClass(), "getBIC()", "Use getIdentifierCode() instead.");
+        DeprecationUtils.phase3(getClass(), "getBIC()", "Use getIdentifierCode() instead.");
         return getIdentifierCode();
     }
 
@@ -348,7 +348,7 @@ public com.prowidesoftware.swift.model.BIC getIdentifierCodeAsBIC() {
     @Deprecated
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     public com.prowidesoftware.swift.model.BIC getBICAsBIC() {
-        DeprecationUtils.phase2(getClass(), "getBICAsBIC()", "Use getIdentifierCodeAsBIC() instead.");
+        DeprecationUtils.phase3(getClass(), "getBICAsBIC()", "Use getIdentifierCodeAsBIC() instead.");
         return getIdentifierCodeAsBIC();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionHPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionHPartyField.java
index 678c098a5..743427374 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionHPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionHPartyField.java
@@ -152,7 +152,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionJPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionJPartyField.java
index 90e52305f..6b960c7bb 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionJPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionJPartyField.java
@@ -126,7 +126,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionKPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionKPartyField.java
index dae9bdc78..77bdf8e66 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionKPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionKPartyField.java
@@ -146,7 +146,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionLPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionLPartyField.java
index 8aefb5a12..371ae88b5 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionLPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionLPartyField.java
@@ -125,7 +125,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionPPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionPPartyField.java
index 172ff6677..3bb3ed35b 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionPPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionPPartyField.java
@@ -144,7 +144,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead");
         return typesPattern();
     }
 
@@ -326,7 +326,7 @@ public BIC getIdentifierCodeAsBIC() {
     @Deprecated
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     public String getBIC() {
-        DeprecationUtils.phase2(getClass(), "getBIC()", "Use getIdentifierCode() instead");
+        DeprecationUtils.phase3(getClass(), "getBIC()", "Use getIdentifierCode() instead");
         return getIdentifierCode();
     }
 
@@ -336,7 +336,7 @@ public String getBIC() {
     @Deprecated
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     public BIC getBICAsBIC() {
-        DeprecationUtils.phase2(getClass(), "getBICAsBIC()", "Use getIdentifierCodeAsBIC() instead");
+        DeprecationUtils.phase3(getClass(), "getBICAsBIC()", "Use getIdentifierCodeAsBIC() instead");
         return getIdentifierCodeAsBIC();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionQPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionQPartyField.java
index a187b191a..2661a58ce 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionQPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionQPartyField.java
@@ -144,7 +144,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionRPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionRPartyField.java
index 43bbfdaaf..ed8d1352c 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionRPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionRPartyField.java
@@ -144,7 +144,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionSPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionSPartyField.java
index 879382f09..aef978a81 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionSPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionSPartyField.java
@@ -163,7 +163,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/OptionUPartyField.java b/src/main/java/com/prowidesoftware/swift/model/field/OptionUPartyField.java
index 8b5c3c7dd..6a902f2d5 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/OptionUPartyField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/OptionUPartyField.java
@@ -143,7 +143,7 @@ public String getValueDisplay(int component, Locale locale) {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }
 
diff --git a/src/main/java/com/prowidesoftware/swift/model/field/StructuredNarrativeField.java b/src/main/java/com/prowidesoftware/swift/model/field/StructuredNarrativeField.java
index 8e90baded..33faac781 100644
--- a/src/main/java/com/prowidesoftware/swift/model/field/StructuredNarrativeField.java
+++ b/src/main/java/com/prowidesoftware/swift/model/field/StructuredNarrativeField.java
@@ -111,7 +111,7 @@ public String getValue() {
     @ProwideDeprecated(phase4 = TargetYear.SRU2024)
     @Override
     public final String componentsPattern() {
-        DeprecationUtils.phase2(getClass(), "componentsPattern()", "Use typesPattern() instead.");
+        DeprecationUtils.phase3(getClass(), "componentsPattern()", "Use typesPattern() instead.");
         return typesPattern();
     }