Name messages improved...