Replaced all instances of @spring.message and updated properties to match convention