Upgraded window renaming

* Added author
* Fixed redundant warning