Add name to message and rename messages to rows