Cleaned up names on Windows.