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

Upgraded window renaming