INT: some renaming in Window class