Upgraded window renaming
Merge pull request #78 from bvssvni/master

Upgraded window renaming