fix message conventions