CE-311 Messages small fix after converting wfmsg to wfmessage
CE-311 Changing names of constants