Applied correct message substitution to DWPCAClaim