Update message number, after consultation with Takahiro
Update name.