Renamed diagnostic messages to something less ego-centric