Upgraded window renaming