Correct window renaming