Thread safe names and removed warnings