Bug 849633: change entity names for messages changed in bug 847181. r=tchevalier,ehsan