Cleaned up names and messages.