Fix automatic rename of windows