fixing names in window class