Fixed issue with Owner of Modal windows.
Renames...