Merge "Use names containing "invalid" or "nonexistent" as invalid name"