Correct MS window class names