Added fix for default window name