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

Upgraded window renaming