Fix window names