Rename message, unify message and title