Keep the previous name, because this function it's called from other system message as well.