diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa42e8321..f597053e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Prowide Core - CHANGELOG
 
 #### 9.4.15 - SNAPSHOT
+  * Updated validators for BIC, country, and currency constraints to utilize keywords for i18n-compatible messages
   * Deprecated unnecessary methods in the SafeXmlUtils class
 
 #### 9.4.14 - December 2023
diff --git a/src/main/java/com/prowidesoftware/swift/constraints/BicConstraint.java b/src/main/java/com/prowidesoftware/swift/constraints/BicConstraint.java
index 53cd01810..4063ee521 100644
--- a/src/main/java/com/prowidesoftware/swift/constraints/BicConstraint.java
+++ b/src/main/java/com/prowidesoftware/swift/constraints/BicConstraint.java
@@ -39,7 +39,7 @@
 @Target({METHOD, FIELD, PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface BicConstraint {
-    String message() default "Invalid BIC code";
+    String message() default "{prowide.invalid.bic.code}";
 
     Class<?>[] groups() default {};
 
diff --git a/src/main/java/com/prowidesoftware/swift/constraints/CountryConstraint.java b/src/main/java/com/prowidesoftware/swift/constraints/CountryConstraint.java
index 431b9ed3c..b58fad4d9 100644
--- a/src/main/java/com/prowidesoftware/swift/constraints/CountryConstraint.java
+++ b/src/main/java/com/prowidesoftware/swift/constraints/CountryConstraint.java
@@ -39,7 +39,7 @@
 @Target({METHOD, FIELD, PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CountryConstraint {
-    String message() default "Invalid ISO country code";
+    String message() default "{prowide.invalid.iso.country.code}";
 
     Class<?>[] groups() default {};
 
diff --git a/src/main/java/com/prowidesoftware/swift/constraints/CurrencyConstraint.java b/src/main/java/com/prowidesoftware/swift/constraints/CurrencyConstraint.java
index 594ac4a6c..209906689 100644
--- a/src/main/java/com/prowidesoftware/swift/constraints/CurrencyConstraint.java
+++ b/src/main/java/com/prowidesoftware/swift/constraints/CurrencyConstraint.java
@@ -39,7 +39,7 @@
 @Target({METHOD, FIELD, PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface CurrencyConstraint {
-    String message() default "Invalid currency code";
+    String message() default "{prowide.invalid.currency.code}";
 
     Class<?>[] groups() default {};
 
diff --git a/src/main/java/com/prowidesoftware/swift/constraints/IbanConstraint.java b/src/main/java/com/prowidesoftware/swift/constraints/IbanConstraint.java
index 5538ae515..4c3056f22 100644
--- a/src/main/java/com/prowidesoftware/swift/constraints/IbanConstraint.java
+++ b/src/main/java/com/prowidesoftware/swift/constraints/IbanConstraint.java
@@ -39,7 +39,7 @@
 @Target({METHOD, FIELD, PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface IbanConstraint {
-    String message() default "Invalid IBAN number";
+    String message() default "{prowide.invalid.iban.number}";
 
     Class<?>[] groups() default {};