Update for renaming Screen to Window